Merge pull request #1222 from lmiccini/new_rabbitmq_struct

Use new messagingBus struct

Author: openshift-merge-bot[bot]

docs_user/modules/proc_adopting-key-manager-service.adoc

@@ -35,7 +35,8 @@ spec:
     template:
       databaseInstance: openstack
       databaseAccount: barbican
-      rabbitMqClusterName: rabbitmq
+      messagingBus:
+        cluster: rabbitmq
       secret: osp-secret
       simpleCryptoBackendSecret: osp-secret
       serviceAccount: barbican

docs_user/modules/proc_deploying-the-bare-metal-provisioning-service.adoc

@@ -95,7 +95,8 @@ spec:
           service: IronicInspectorPassword
       ironicNeutronAgent:
         replicas: 1
-        rabbitMqClusterName: rabbitmq
+        messagingBus:
+          cluster: rabbitmq
       secret: osp-secret
 '
 ----

tests/roles/autoscaling_adoption/tasks/main.yaml

@@ -16,6 +16,8 @@
               databaseInstance: openstack
               secret: osp-secret
               serviceUser: aodh
+              notificationsBus:
+                cluster: rabbitmq
             heatInstance: heat
     '
 

tests/roles/barbican_adoption/defaults/main.yaml

@@ -11,7 +11,8 @@ barbican_patch: |
       template:
         databaseInstance: openstack
         databaseAccount: barbican
-        rabbitMqClusterName: rabbitmq
+        messagingBus:
+          cluster: rabbitmq
         secret: osp-secret
         simpleCryptoBackendSecret: osp-secret
         serviceAccount: barbican
@@ -52,7 +53,8 @@ barbican_hsm_patch: |
       template:
         databaseInstance: openstack
         databaseAccount: barbican
-        rabbitMqClusterName: rabbitmq
+        messagingBus:
+          cluster: rabbitmq
         secret: osp-secret
         simpleCryptoBackendSecret: osp-secret
         serviceAccount: barbican

tests/roles/heat_adoption/defaults/main.yaml

@@ -16,7 +16,8 @@ heat_patch: |
           authEncryptionKey: HeatAuthEncryptionKey
           service: HeatPassword
           stackDomainAdminPassword: HeatStackDomainAdminPassword
-        rabbitMqClusterName: rabbitmq
+        messagingBus:
+          cluster: rabbitmq
         serviceUser: heat
 
 heat_retry_delay: 5

tests/roles/ironic_adoption/defaults/main.yaml

@@ -74,7 +74,8 @@ ironic_patch: |
             service: IronicInspectorPassword
         ironicNeutronAgent:
           replicas: 1
-          rabbitMqClusterName: rabbitmq
+          messagingBus:
+            cluster: rabbitmq
         secret: osp-secret
 
 ironic_disable_rbac_patch: |

tests/roles/nova_adoption/defaults/main.yaml

@@ -12,7 +12,8 @@ nova_libvirt_patch: |
             hasAPIAccess: true
             cellDatabaseAccount: nova-$CELL
             cellDatabaseInstance: openstack-$CELL
-            cellMessageBusInstance: rabbitmq-$CELL
+            messagingBus:
+              cluster: rabbitmq-$CELL
             metadataServiceTemplate:
               enabled: false # enable here to run it in a cell instead
               override:
@@ -95,7 +96,8 @@ nova_libvirt_patch: |
             hasAPIAccess: true
             cellDatabaseAccount: nova-cell0
             cellDatabaseInstance: openstack
-            cellMessageBusInstance: rabbitmq
+            messagingBus:
+              cluster: rabbitmq
             conductorServiceTemplate:
               customServiceConfig: |
                 [workarounds]
@@ -171,7 +173,8 @@ nova_ironic_patch: |
             hasAPIAccess: true
             cellDatabaseAccount: nova-cell{{ loop.index }}
             cellDatabaseInstance: openstack-cell{{ loop.index }}
-            cellMessageBusInstance: rabbitmq-cell{{ loop.index }}
+            messagingBus:
+              cluster: rabbitmq-cell{{ loop.index }}
             conductorServiceTemplate:
               customServiceConfig: |
                 [workarounds]

tests/roles/telemetry_adoption/defaults/main.yaml

@@ -26,6 +26,8 @@ telemetry_ceilometer_patch: |
           enabled: true
           secret: osp-secret
           serviceUser: ceilometer
+          notificationsBus:
+            cluster: rabbitmq
 
 telemetry_logging_patch: |
   spec: