update monitoring service
Change-Id: If8a7df6def3ee8751c94e7f52abb96fc190015c0
diff --git a/mcord/monitoringservice.yaml b/mcord/monitoringservice.yaml
index 603ac09..1459091 100644
--- a/mcord/monitoringservice.yaml
+++ b/mcord/monitoringservice.yaml
@@ -4,139 +4,7 @@
imports:
- custom_types/xos.yaml
-
-node_types:
- tosca.nodes.SFlowService:
- derived_from: tosca.nodes.Root
- description: >
- XOS SFlow Collection Service
- capabilities:
- scalable:
- type: tosca.capabilities.Scalable
- service:
- type: tosca.capabilities.xos.Service
- properties:
- no-delete:
- type: boolean
- default: false
- description: Do not allow Tosca to delete this object
- no-create:
- type: boolean
- default: false
- description: Do not allow Tosca to create this object
- no-update:
- type: boolean
- default: false
- description: Do not allow Tosca to update this object
- kind:
- type: string
- default: generic
- description: Type of service.
- view_url:
- type: string
- required: false
- description: URL to follow when icon is clicked in the Service Directory.
- icon_url:
- type: string
- required: false
- description: ICON to display in the Service Directory.
- enabled:
- type: boolean
- default: true
- published:
- type: boolean
- default: true
- description: If True then display this Service in the Service Directory.
- public_key:
- type: string
- required: false
- description: Public key to install into Instances to allows Services to SSH into them.
- private_key_fn:
- type: string
- required: false
- description: Location of private key file
- versionNumber:
- type: string
- required: false
- description: Version number of Service.
- sflow_port:
- type: integer
- required: false
- default: 6343
- description: sFlow listening port
- sflow_api_port:
- type: integer
- required: false
- default: 33333
- description: sFlow publish subscribe api listening port
-
- tosca.nodes.CeilometerService:
- derived_from: tosca.nodes.Root
- description: >
- XOS Ceilometer Service
- capabilities:
- scalable:
- type: tosca.capabilities.Scalable
- service:
- type: tosca.capabilities.xos.Service
- properties:
- no-delete:
- type: boolean
- default: false
- description: Do not allow Tosca to delete this object
- no-create:
- type: boolean
- default: false
- description: Do not allow Tosca to create this object
- no-update:
- type: boolean
- default: false
- description: Do not allow Tosca to update this object
- kind:
- type: string
- default: generic
- description: Type of service.
- view_url:
- type: string
- required: false
- description: URL to follow when icon is clicked in the Service Directory.
- icon_url:
- type: string
- required: false
- description: ICON to display in the Service Directory.
- enabled:
- type: boolean
- default: true
- published:
- type: boolean
- default: true
- description: If True then display this Service in the Service Directory.
- public_key:
- type: string
- required: false
- description: Public key to install into Instances to allows Services to SSH into them.
- private_key_fn:
- type: string
- required: false
- description: Location of private key file
- versionNumber:
- type: string
- required: false
- description: Version number of Service.
- ceilometer_pub_sub_url:
- type: string
- required: false
- description: REST URL of ceilometer PUB/SUB component
-
- tosca.nodes.CeilometerTenant:
- derived_from: tosca.nodes.Root
- description: >
- CORD: A Tenant of the Ceilometer Service.
- properties:
- kind:
- type: string
- default: generic
- description: Kind of tenant
+ - custom_types/monitoring_tosca_types.yaml
topology_template:
node_templates:
@@ -205,6 +73,8 @@
mysite_ceilometer:
description: Ceilometer Proxy Slice
type: tosca.nodes.Slice
+ properties:
+ default_node: salty-interest
requirements:
- ceilometer_service:
node: service_ceilometer
@@ -221,8 +91,6 @@
- m1.small:
node: m1.small
relationship: tosca.relationships.DefaultFlavor
- properties:
- default_node: nova-compute-1
# Virtual machines
ceilometer_service_instance:
@@ -231,7 +99,7 @@
# Host container properties
host:
properties:
- num_cpus: 1
+ num_cpus: 2
disk_size: 20 GB
mem_size: 2 GB
requirements:
diff --git a/mcord/monitoringtenant.yaml b/mcord/monitoringtenant.yaml
index 37cda64..c6d5f14 100644
--- a/mcord/monitoringtenant.yaml
+++ b/mcord/monitoringtenant.yaml
@@ -4,140 +4,7 @@
imports:
- custom_types/xos.yaml
-
-node_types:
-#FIXME: See if we can avoid redefining the below types again in this file by moving to common file
- tosca.nodes.SFlowService:
- derived_from: tosca.nodes.Root
- description: >
- XOS SFlow Collection Service
- capabilities:
- scalable:
- type: tosca.capabilities.Scalable
- service:
- type: tosca.capabilities.xos.Service
- properties:
- no-delete:
- type: boolean
- default: false
- description: Do not allow Tosca to delete this object
- no-create:
- type: boolean
- default: false
- description: Do not allow Tosca to create this object
- no-update:
- type: boolean
- default: false
- description: Do not allow Tosca to update this object
- kind:
- type: string
- default: generic
- description: Type of service.
- view_url:
- type: string
- required: false
- description: URL to follow when icon is clicked in the Service Directory.
- icon_url:
- type: string
- required: false
- description: ICON to display in the Service Directory.
- enabled:
- type: boolean
- default: true
- published:
- type: boolean
- default: true
- description: If True then display this Service in the Service Directory.
- public_key:
- type: string
- required: false
- description: Public key to install into Instances to allows Services to SSH into them.
- private_key_fn:
- type: string
- required: false
- description: Location of private key file
- versionNumber:
- type: string
- required: false
- description: Version number of Service.
- sflow_port:
- type: integer
- required: false
- default: 6343
- description: sFlow listening port
- sflow_api_port:
- type: integer
- required: false
- default: 33333
- description: sFlow publish subscribe api listening port
-
- tosca.nodes.CeilometerService:
- derived_from: tosca.nodes.Root
- description: >
- XOS Ceilometer Service
- capabilities:
- scalable:
- type: tosca.capabilities.Scalable
- service:
- type: tosca.capabilities.xos.Service
- properties:
- no-delete:
- type: boolean
- default: false
- description: Do not allow Tosca to delete this object
- no-create:
- type: boolean
- default: false
- description: Do not allow Tosca to create this object
- no-update:
- type: boolean
- default: false
- description: Do not allow Tosca to update this object
- kind:
- type: string
- default: generic
- description: Type of service.
- view_url:
- type: string
- required: false
- description: URL to follow when icon is clicked in the Service Directory.
- icon_url:
- type: string
- required: false
- description: ICON to display in the Service Directory.
- enabled:
- type: boolean
- default: true
- published:
- type: boolean
- default: true
- description: If True then display this Service in the Service Directory.
- public_key:
- type: string
- required: false
- description: Public key to install into Instances to allows Services to SSH into them.
- private_key_fn:
- type: string
- required: false
- description: Location of private key file
- versionNumber:
- type: string
- required: false
- description: Version number of Service.
- ceilometer_pub_sub_url:
- type: string
- required: false
- description: REST URL of ceilometer PUB/SUB component
-
- tosca.nodes.CeilometerTenant:
- derived_from: tosca.nodes.Root
- description: >
- CORD: A Tenant of the Ceilometer Service.
- properties:
- kind:
- type: string
- default: generic
- description: Kind of tenant
+ - custom_types/monitoring_tosca_types.yaml
topology_template:
node_templates: