Merge "Use old redis urls generation in AIO" into stable/queens
diff --git a/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml b/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml
index 63abe0f..adc9eb1 100755
--- a/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml
@@ -13,10 +13,8 @@
- system.ceilometer.client.cinder_volume
- system.ceilometer.client.nova_compute
- system.gnocchi.common.storage.file
-- system.gnocchi.common.storage.incoming.redis
- system.gnocchi.server.single
- system.gnocchi.statsd.single
-- system.gnocchi.common.coordination.redis
- service.redis.server.single
- system.panko.server.single
- service.ceilometer.server.single.common
@@ -33,9 +31,7 @@
aodh_version: ${_param:openstack_version}
gnocchi_version: 4.2
gnocchi_statsd_resource_id: 07f26121-5777-48ba-8a0b-d70468133dd9
- redis_sentinel_node01_address: ${_param:single_address}
- redis_sentinel_node02_address: ${_param:single_address}
- redis_sentinel_node03_address: ${_param:single_address}
+ gnocchi_storage_incoming_driver: redis
openstack_telemetry_redis_password: workshop
ceilometer_create_gnocchi_resources: true
ceilometer_agent_default_polling_interval: 15
@@ -72,6 +68,12 @@
database:
ssl:
enabled: ${_param:galera_ssl_enabled}
+ coordination_backend:
+ url: redis://${_param:single_address}:6379?db=0
+ storage:
+ incoming:
+ driver: ${_param:gnocchi_storage_incoming_driver}
+ redis_url: redis://${_param:single_address}:6379?db=0
server:
cache:
engine: memcached