Merge "Get rid of infra.init class to simplify parameters override" 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 f4c7060..460cfb0 100755
--- a/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml
@@ -22,15 +22,14 @@
- service.panko.server.single
- service.ceilometer.server.single
- service.ceilometer.agent.single
-- service.ceilometer.server.publisher.gnocchi
-- service.ceilometer.server.publisher.panko
+- system.ceilometer.server.backend.default
parameters:
_param:
cluster_public_protocol: http
panko_version: ${_param:openstack_version}
ceilometer_version: ${_param:openstack_version}
aodh_version: ${_param:openstack_version}
- gnocchi_version: 4.0
+ gnocchi_version: 4.2
gnocchi_statsd_resource_id: 07f26121-5777-48ba-8a0b-d70468133dd9
ceilometer_create_gnocchi_resources: true
ceilometer_agent_default_polling_interval: 15
@@ -49,6 +48,8 @@
ceilometer_service_host: ${_param:single_address}
panko_service_host: ${_param:single_address}
gnocchi_service_host: ${_param:single_address}
+ # ceilometer database host is hardcoded on service level
+ ceilometer_database_host: ${_param:single_address}
nova:
controller:
@@ -82,14 +83,10 @@
enabled: ${_param:rabbitmq_ssl_enabled}
ceilometer:
server:
- database: ~
message_queue:
port: ${_param:rabbitmq_port}
ssl:
enabled: ${_param:rabbitmq_ssl_enabled}
- publisher:
- default:
- enabled: false
agent:
polling:
sources: