FIXes in Makefile for monitoring service deployment
Change-Id: Ic0aae5c692a3fd94d9659e313dd847b7e1e21993
diff --git a/cord-pod/monitoringservice.yaml b/cord-pod/monitoringservice.yaml
index da9c01d..b076057 100644
--- a/cord-pod/monitoringservice.yaml
+++ b/cord-pod/monitoringservice.yaml
@@ -16,6 +16,18 @@
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
@@ -68,6 +80,18 @@
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
@@ -172,6 +196,9 @@
ceilometer-trusty-server-multi-nic:
type: tosca.nodes.Image
+ ceilometer-service-trusty-server-multi-nic:
+ type: tosca.nodes.Image
+
m1.small:
type: tosca.nodes.Flavor
@@ -195,6 +222,24 @@
node: m1.small
relationship: tosca.relationships.DefaultFlavor
+ # Virtual machines
+ ceilometer_service_instance:
+ type: tosca.nodes.Compute
+ capabilities:
+ # Host container properties
+ host:
+ properties:
+ num_cpus: 1
+ disk_size: 20 GB
+ mem_size: 2 GB
+ requirements:
+ - slice:
+ node: mysite_ceilometer
+ relationship: tosca.relationships.MemberOfSlice
+ - image:
+ node: ceilometer-service-trusty-server-multi-nic
+ relationship: tosca.relationships.UsesImage
+
# mysite_sflow:
# description: Slice for sFlow service
# type: tosca.nodes.Slice
@@ -206,13 +251,17 @@
# node: mysite
# relationship: tosca.relationships.MemberOfSite
- my_ceilometer_tenant:
- description: Ceilometer Service default Tenant
- type: tosca.nodes.CeilometerTenant
- requirements:
- - provider_service:
- node: service_ceilometer
- relationship: tosca.relationships.MemberOfService
+# MOVING this section to monitoringtenant.yaml
+# my_ceilometer_tenant:
+# description: Ceilometer Service default Tenant
+# type: tosca.nodes.CeilometerTenant
+# requirements:
+# - provider_service:
+# node: service_ceilometer
+# relationship: tosca.relationships.MemberOfService
+# - dependency:
+# node: ceilometer_service_instance
+# relationship: tosca.relationships.DependsOn
# Virtual machines
# sflow_service_instance:
@@ -237,27 +286,28 @@
# node: mysite_sflow
# relationship: tosca.relationships.MemberOfSlice
- Ceilometer:
- type: tosca.nodes.DashboardView
- properties:
- url: template:xosCeilometerDashboard
- Tenant:
- type: tosca.nodes.DashboardView
- properties:
- no-create: true
- no-update: true
- no-delete: true
-
- padmin@vicci.org:
- type: tosca.nodes.User
- properties:
- firstname: XOS
- lastname: admin
- is_admin: true
- requirements:
- - tenant_dashboard:
- node: Tenant
- relationship: tosca.relationships.UsesDashboard
- - ceilometer_dashboard:
- node: Ceilometer
- relationship: tosca.relationships.UsesDashboard
+# MOVING the below sections to monitoringtenant.yaml
+# Ceilometer:
+# type: tosca.nodes.DashboardView
+# properties:
+# url: template:xosCeilometerDashboard
+# Tenant:
+# type: tosca.nodes.DashboardView
+# properties:
+# no-create: true
+# no-update: true
+# no-delete: true
+#
+# padmin@vicci.org:
+# type: tosca.nodes.User
+# properties:
+# firstname: XOS
+# lastname: admin
+# is_admin: true
+# requirements:
+# - tenant_dashboard:
+# node: Tenant
+# relationship: tosca.relationships.UsesDashboard
+# - ceilometer_dashboard:
+# node: Ceilometer
+# relationship: tosca.relationships.UsesDashboard