Merge "Update gnocchi_version to 4.3" into stable/rocky
diff --git a/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml b/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml
index 88f6a91..781afd1 100755
--- a/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml
@@ -11,7 +11,6 @@
- system.aodh.server.single
- system.ceilometer.client
- system.ceilometer.client.cinder_volume
-- system.ceilometer.client.neutron
- system.ceilometer.client.nova_compute
- system.gnocchi.common.storage.file
- system.gnocchi.common.storage.incoming.redis
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index 884c0c9..084d523 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -31,6 +31,8 @@
- system.heat.server.single
- system.nova.compute.single
- service.neutron.gateway.single
+- system.nova.control.notification.messagingv2
+- system.neutron.control.notification.messagingv2
- system.cinder.control.single
- system.cinder.control.backend.lvm
- service.cinder.volume.single
@@ -138,6 +140,7 @@
glance_image_fedora_location: 'https://artifactory.mcp.mirantis.net/artifactory/test-images/Fedora-Cloud-Base-27-1.6.x86_64.qcow2'
openstack_control_address: ${_param:single_address}
glance_cors_allowed_origin: "http://${_param:single_address}:8078"
+ openstack_notification_topics: 'notifications'
galera:
master:
innodb_buffer_pool_size: 1024M
@@ -277,6 +280,7 @@
project_domain_name: 'Default'
heat:
server:
+ reauthentication_auth_method: 'trusts'
database:
ssl:
enabled: ${_param:galera_ssl_enabled}