| commit | e963a535fa0b702a4f11bfbf0ab149ea21a19a45 | [log] [tgz] |
|---|---|---|
| author | Ildar Svetlov <isvetlov@mirantis.com> | Thu Jun 29 13:39:37 2017 +0400 |
| committer | Ildar Svetlov <isvetlov@mirantis.com> | Tue Jul 11 14:20:04 2017 +0000 |
| tree | c44d0f0bd5e305f59ca4353cb7c0cd41dffa56f4 | |
| parent | e13f6b97e35a6d9911d91e66e1d3fc73a0a1cde9 [diff] |
Add tenant monitoring to virtual-mcp11-contrail Change-Id: I5ff1b3961272d2cd9667f74d70dd8fd12cae5af5
diff --git a/classes/cluster/virtual-mcp11-contrail/init.yml b/classes/cluster/virtual-mcp11-contrail/init.yml index ade1433..a1e738d 100755 --- a/classes/cluster/virtual-mcp11-contrail/init.yml +++ b/classes/cluster/virtual-mcp11-contrail/init.yml
@@ -60,6 +60,8 @@ stacklight_monitor_node03_address: 172.16.10.109 stacklight_log_address: ${_param:stacklight_monitor_address} + stacklight_telemetry_address: ${_param:stacklight_monitor_address} + stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address} linux: network:
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/compute.yml b/classes/cluster/virtual-mcp11-contrail/openstack/compute.yml index 967d151..3a894f8 100755 --- a/classes/cluster/virtual-mcp11-contrail/openstack/compute.yml +++ b/classes/cluster/virtual-mcp11-contrail/openstack/compute.yml
@@ -4,6 +4,7 @@ - system.linux.system.repo.mcp.extra - system.linux.system.repo.saltstack.xenial - system.nova.compute.cluster +- system.ceilometer.agent.cluster - system.opencontrail.compute.cluster - system.opencontrail.client.cluster - system.opencontrail.client.resource.virtual_router
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml index 03f23ef..8ad024a 100755 --- a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml +++ b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
@@ -28,7 +28,9 @@ - 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
diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml index 5f0bbf7..099f7a6 100755 --- a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml +++ b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
@@ -19,6 +19,7 @@ - service.haproxy.proxy.single - system.influxdb.server.single - system.influxdb.database.stacklight +- system.influxdb.database.ceilometer - system.keepalived.cluster.instance.prometheus_server_vip - system.telegraf.agent.remote - system.prometheus.server.remote_write.docker