Update sl-os-contrail model to ocata
Change-Id: Iee4c367102ced269ef20752a6398494a35f03058
diff --git a/classes/cluster/sl-os-contrail/openstack/control.yml b/classes/cluster/sl-os-contrail/openstack/control.yml
index c934ea0..dee70ed 100755
--- a/classes/cluster/sl-os-contrail/openstack/control.yml
+++ b/classes/cluster/sl-os-contrail/openstack/control.yml
@@ -18,12 +18,21 @@
- system.glusterfs.client.volume.keystone
- system.glance.control.cluster
- system.nova.control.cluster
+- system.haproxy.proxy.listen.openstack.nova-placement
- system.neutron.control.opencontrail.cluster
- system.cinder.control.cluster
- system.heat.server.cluster
+- system.opencontrail.client.cluster
+- system.heat.server.resource.contrail
- system.designate.server.cluster
- system.designate.server.backend.bind
+- system.ceilometer.server.cluster
+- system.ceilometer.server.backend.influxdb
+- system.aodh.server.cluster
+- system.heka.ceilometer_collector.single
- system.galera.server.cluster
+- system.galera.server.database.aodh
+- system.galera.server.database.ceilometer
- system.galera.server.database.cinder
- system.galera.server.database.glance
- system.galera.server.database.grafana
@@ -31,8 +40,6 @@
- system.galera.server.database.keystone
- system.galera.server.database.nova
- system.galera.server.database.designate
-- system.haproxy.proxy.listen.openstack.nova-placement
-- system.prometheus.exporters.jmx
- cluster.sl-os-contrail
parameters:
_param:
@@ -165,4 +172,3 @@
notification:
driver: messagingv2
topics: "notifications,${_param:stacklight_notification_topic}"
-