Fixes to make ACORD service-profile work in devstack mitaka backend-part1
Change-Id: Ie0d2e8dc6d3a9a92506e21a23c7bc6df73deca9e
diff --git a/acord/ceilometer.yaml b/acord/ceilometer.yaml
index 089837d..43ca71a 100644
--- a/acord/ceilometer.yaml
+++ b/acord/ceilometer.yaml
@@ -120,21 +120,22 @@
type: tosca.nodes.CeilometerService
requirements:
properties:
- view_url: /admin/ceilometer/ceilometerservice/$id$/
+ view_url: /admin/monitoring/ceilometerservice/$id$/
kind: ceilometer
ceilometer_pub_sub_url: http://130.127.133.58:4455/
public_key: { get_artifact: [ SELF, pubkey, LOCAL_FILE] }
+ private_key_fn: /opt/xos/services/monitoring/keys/monitoringservice_rsa
artifacts:
- pubkey: /opt/xos/synchronizers/monitoring_channel/monitoring_channel_public_key
+ pubkey: /opt/xos/services/monitoring/keys/monitoringservice_rsa.pub
- service_sflow:
- type: tosca.nodes.SFlowService
- requirements:
- properties:
- view_url: /admin/ceilometer/sflowservice/$id$/
- kind: sflow
- sflow_port: 6343
- sflow_api_port: 33333
+# service_sflow:
+# type: tosca.nodes.SFlowService
+# requirements:
+# properties:
+# view_url: /admin/ceilometer/sflowservice/$id$/
+# kind: sflow
+# sflow_port: 6343
+# sflow_api_port: 33333
Private:
type: tosca.nodes.NetworkTemplate
@@ -183,27 +184,25 @@
- m1.small:
node: m1.small
relationship: tosca.relationships.DefaultFlavor
- properties:
- max_instances: 2
- mysite_sflow:
- description: Slice for sFlow service
- type: tosca.nodes.Slice
- requirements:
- - sflow_service:
- node: service_sflow
- relationship: tosca.relationships.MemberOfService
- - site:
- node: mysite
- relationship: tosca.relationships.MemberOfSite
- - default_image:
- node: trusty-server-multi-nic
- relationship: tosca.relationships.DefaultImage
- - m1.small:
- node: m1.small
- relationship: tosca.relationships.DefaultFlavor
- properties:
- max_instances: 2
+# mysite_sflow:
+# description: Slice for sFlow service
+# type: tosca.nodes.Slice
+# requirements:
+# - sflow_service:
+# node: service_sflow
+# relationship: tosca.relationships.MemberOfService
+# - site:
+# node: mysite
+# relationship: tosca.relationships.MemberOfSite
+# - default_image:
+# node: trusty-server-multi-nic
+# relationship: tosca.relationships.DefaultImage
+# - m1.small:
+# node: m1.small
+# relationship: tosca.relationships.DefaultFlavor
+# properties:
+# max_instances: 2
my_ceilometer_tenant:
description: Ceilometer Service default Tenant
@@ -213,28 +212,28 @@
node: service_ceilometer
relationship: tosca.relationships.MemberOfService
- # Virtual machines
- sflow_service_instance:
- type: tosca.nodes.Compute
- capabilities:
- # Host container properties
- host:
- properties:
- num_cpus: 1
- disk_size: 10 GB
- mem_size: 4 MB
- # Guest Operating System properties
- os:
- properties:
- # host Operating System image properties
- architecture: x86_64
- type: linux
- distribution: Ubuntu
- version: 14.10
- requirements:
- - slice:
- node: mysite_sflow
- relationship: tosca.relationships.MemberOfSlice
+# # Virtual machines
+# sflow_service_instance:
+# type: tosca.nodes.Compute
+# capabilities:
+# # Host container properties
+# host:
+# properties:
+# num_cpus: 1
+# disk_size: 10 GB
+# mem_size: 4 MB
+# # Guest Operating System properties
+# os:
+# properties:
+# # host Operating System image properties
+# architecture: x86_64
+# type: linux
+# distribution: Ubuntu
+# version: 14.10
+# requirements:
+# - slice:
+# node: mysite_sflow
+# relationship: tosca.relationships.MemberOfSlice
Ceilometer:
type: tosca.nodes.DashboardView