Remove LMA form offline-dpdk, add telemetry
Change-Id: I8b500f044bdd830dde25fbd1571fd7965cb92122
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
index 56dbe98..6f58513 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
@@ -7,25 +7,29 @@
#- system.openssh.client.lab
- system.salt.master.pkg
- system.salt.master.api
+- system.salt.master.formula.pkg.gnocchi
+- system.salt.master.formula.pkg.panko
- system.reclass.storage.salt
- system.salt.minion.ca.salt_master
- system.salt.minion.cert.proxy
- system.keystone.client.single
-- system.keystone.client.service.aodh
-- system.keystone.client.service.ceilometer
- system.keystone.client.service.nova21
- system.keystone.client.service.nova-placement
-- system.keystone.client.service.glare
- system.keystone.client.service.cinder3
- system.keystone.client.service.designate
-- system.mysql.client.single
+- system.keystone.client.service.aodh
+- system.keystone.client.service.ceilometer
+- system.keystone.client.service.panko
+- system.keystone.client.service.gnocchi
+- system.gnocchi.client
+- system.gnocchi.client.v1.archive_policy.default
+- system.reclass.storage.system.openstack_dns_cluster
- system.reclass.storage.system.openstack_control_cluster
- system.reclass.storage.system.openstack_compute_multi
- system.reclass.storage.system.openstack_gateway_single
- system.reclass.storage.system.openstack_dashboard_single
-- system.reclass.storage.system.stacklightv2_server_cluster
+- system.reclass.storage.system.openstack_telemetry_cluster
- cluster.virtual-offline-pike-ovs-dpdk.infra.backup.client_common
-- cluster.virtual-offline-pike-ovs-dpdk.stacklight.proxy
- cluster.virtual-offline-pike-ovs-dpdk
parameters:
_param:
@@ -125,20 +129,15 @@
cluster_param:
openstack_gateway_node01_address:
value_template: <<node_control_ip>>
- stacklight_monitor_node01:
- expression: <<node_hostname>>__equals__mon01
+ openstack_dns01:
+ expression: <<node_hostname>>__equals__dns01
cluster_param:
- stacklight_monitor_node01_address:
+ openstack_dns_node01_address:
value_template: <<node_control_ip>>
- stacklight_monitor_node02:
- expression: <<node_hostname>>__equals__mon02
+ openstack_dns02:
+ expression: <<node_hostname>>__equals__dns02
cluster_param:
- stacklight_monitor_node02_address:
- value_template: <<node_control_ip>>
- stacklight_monitor_node03:
- expression: <<node_hostname>>__equals__mon03
- cluster_param:
- stacklight_monitor_node03_address:
+ openstack_dns_node02_address:
value_template: <<node_control_ip>>
openstack_dashboard:
expression: <<node_hostname>>__startswith__prx
@@ -149,6 +148,21 @@
cluster_param:
openstack_proxy_node01_address:
value_template: <<node_control_ip>>
+ openstack_telemetry01:
+ expression: <<node_hostname>>__equals__mdb01
+ cluster_param:
+ openstack_telemetry_node01_address:
+ value_template: <<node_control_ip>>
+ openstack_telemetry02:
+ expression: <<node_hostname>>__equals__mdb02
+ cluster_param:
+ openstack_telemetry_node02_address:
+ value_template: <<node_control_ip>>
+ openstack_telemetry03:
+ expression: <<node_hostname>>__equals__mdb03
+ cluster_param:
+ openstack_telemetry_node03_address:
+ value_template: <<node_control_ip>>
node:
openstack_control_node01:
classes:
@@ -170,10 +184,6 @@
params:
mysql_cluster_role: slave
linux_system_codename: xenial
- stacklight_server_node01:
- classes:
- - system.influxdb.server.single
- - system.influxdb.database.stacklight
openstack_compute_node01:
params:
dpdk0_name: ens5
@@ -197,3 +207,15 @@
- cluster.virtual-offline-pike-ovs-dpdk.openstack.proxy
params:
linux_system_codename: xenial
+ openstack_telemetry_node01:
+ params:
+ # create resources only from 1 controller
+ # to prevent race conditions
+ ceilometer_create_gnocchi_resources: true
+ redis_cluster_role: 'master'
+ openstack_telemetry_node02:
+ params:
+ redis_cluster_role: 'slave'
+ openstack_telemetry_node03:
+ params:
+ redis_cluster_role: 'slave'