Single-cluster RabbitMQ for OpenStack

The intention for the patch is to increase the stability of
OpenStack installation:

1. Use a single RabbitMQ cluster for all OpenStack services.
2. Use 2 replicas for RabbitMQ clusters instead of 3; RabbitMQ
   does not implement a quorum mechanism which allows us to have
   even number of nodes, this should provide better performance
   by reducing the number of instances where the data should be
   replicated. This should also reduce the odds of getting
   RabbitMQ partitioning.

Co-authored-by: Drew Walters <andrew.walters@att.com>

Change-Id: Id981e2650efc24a9e67cf87a0abd414a96f40088

global/schemas/pegleg/EndpointCatalogue/v1.yaml

@@ -18,6 +18,13 @@ data:
             - type: "null"
         name:
           type: string
+        statefulset:
+          type: object
+          properties:
+            replicas:
+              type: number
+            name:
+              type: string
         auth:
           type: object
         hosts:

global/software/charts/osh/openstack-cinder/chart-group.yaml

@@ -13,5 +13,4 @@ metadata:
 data:
   description: Deploy Cinder
   chart_group:
-    - cinder-rabbitmq
     - cinder

global/software/charts/osh/openstack-cinder/cinder.yaml

@@ -73,7 +73,7 @@ metadata:
     - src:
         schema: pegleg/EndpointCatalogue/v1
         name: osh_endpoints
-        path: .osh.cinder_oslo_messaging
+        path: .osh.oslo_messaging
       dest:
         path: .values.endpoints.oslo_messaging
     - src:
@@ -103,7 +103,7 @@ metadata:
     - src:
         schema: pegleg/AccountCatalogue/v1
         name: osh_service_accounts
-        path: .osh.cinder.oslo_messaging.admin
+        path: .osh.oslo_messaging.admin
       dest:
         path: .values.endpoints.oslo_messaging.auth.admin
     - src:
@@ -125,6 +125,13 @@ metadata:
       dest:
         path: .values.endpoints.oslo_db.path
         pattern: DB_NAME
+    - src:
+        schema: pegleg/EndpointCatalogue/v1
+        name: osh_endpoints
+        path: .osh.volume.name
+      dest:
+        path: .values.endpoints.oslo_messaging.path
+        pattern: VHOST_NAME
 
     # Secrets
     - dest:
@@ -143,13 +150,13 @@ metadata:
         path: .values.endpoints.oslo_messaging.auth.admin.password
       src:
         schema: deckhand/Passphrase/v1
-        name: osh_cinder_oslo_messaging_admin_password
+        name: osh_oslo_messaging_admin_password
         path: .
     - dest:
         path: .values.endpoints.oslo_messaging.auth.cinder.password
       src:
         schema: deckhand/Passphrase/v1
-        name: osh_cinder_oslo_messaging_password
+        name: osh_oslo_messaging_admin_password
         path: .
     - dest:
         path: .values.endpoints.oslo_db.auth.cinder.password

global/software/charts/osh/openstack-compute-kit/chart-group.yaml

@@ -14,7 +14,5 @@ data:
   chart_group:
     - libvirt
     - openvswitch
-    - neutron-rabbitmq
-    - nova-rabbitmq
     - neutron
     - nova

global/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml

@@ -1,120 +0,0 @@
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: neutron-rabbitmq
-  labels:
-    name: neutron-rabbitmq-global
-    component: neutron
-  layeringDefinition:
-    abstract: false
-    layer: global
-  storagePolicy: cleartext
-  substitutions:
-    # Chart source
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .charts.osh.rabbitmq
-      dest:
-        path: .source
-
-    # Images
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .images.osh.rabbitmq
-      dest:
-        path: .values.images.tags
-
-    # Endpoints
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: osh_endpoints
-        path: .osh.neutron_oslo_messaging
-      dest:
-        path: .values.endpoints.oslo_messaging
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: osh_endpoints
-        path: .osh.neutron_rabbitmq_exporter
-      dest:
-        path: .values.endpoints.prometheus_rabbitmq_exporter
-    # Credentials
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: osh_service_accounts
-        path: .osh.neutron.oslo_messaging.admin
-      dest:
-        path: .values.endpoints.oslo_messaging.auth.user
-
-    # Secrets
-
-    - src:
-        schema: deckhand/Passphrase/v1
-        name: osh_neutron_rabbitmq_erlang_cookie
-        path: .
-      dest:
-        path: .values.endpoints.oslo_messaging.auth.erlang_cookie
-    - src:
-        schema: deckhand/Passphrase/v1
-        name: osh_neutron_oslo_messaging_admin_password
-        path: .
-      dest:
-        path: .values.endpoints.oslo_messaging.auth.user.password
-data:
-  chart_name: neutron-rabbitmq
-  release: neutron-rabbitmq
-  namespace: openstack
-  wait:
-    timeout: 900
-    labels:
-      release_group: airship-neutron-rabbitmq
-    resources:
-      - type: statefulset
-  install:
-    no_hooks: false
-  upgrade:
-    no_hooks: false
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: airship-neutron-rabbitmq
-  values:
-    labels:
-      server:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-      prometheus_rabbitmq_exporter:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-    monitoring:
-      prometheus:
-        enabled: true
-  dependencies:
-    - neutron-rabbitmq-htk
-...
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: neutron-rabbitmq-htk
-  layeringDefinition:
-    abstract: false
-    layer: global
-  storagePolicy: cleartext
-  substitutions:
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .charts.osh.rabbitmq-htk
-      dest:
-        path: .source
-data:
-  chart_name: neutron-rabbitmq-htk
-  release: neutron-rabbitmq-htk
-  namespace: neutron-rabbitmq-htk
-  values: {}
-  dependencies: []
-...

global/software/charts/osh/openstack-compute-kit/neutron.yaml

@@ -55,7 +55,7 @@ metadata:
     - src:
         schema: pegleg/EndpointCatalogue/v1
         name: osh_endpoints
-        path: .osh.neutron_oslo_messaging
+        path: .osh.oslo_messaging
       dest:
         path: .values.endpoints.oslo_messaging
     - src:
@@ -97,7 +97,7 @@ metadata:
     - src:
         schema: pegleg/AccountCatalogue/v1
         name: osh_service_accounts
-        path: .osh.neutron.oslo_messaging.admin
+        path: .osh.oslo_messaging.admin
       dest:
         path: .values.endpoints.oslo_messaging.auth.admin
     - src:
@@ -119,6 +119,13 @@ metadata:
       dest:
         path: .values.endpoints.oslo_db.path
         pattern: DB_NAME
+    - src:
+        schema: pegleg/EndpointCatalogue/v1
+        name: osh_endpoints
+        path: .osh.network.name
+      dest:
+        path: .values.endpoints.oslo_messaging.path
+        pattern: VHOST_NAME
 
     # Secrets
     - dest:
@@ -143,13 +150,13 @@ metadata:
         path: .values.endpoints.oslo_messaging.auth.admin.password
       src:
         schema: deckhand/Passphrase/v1
-        name: osh_neutron_oslo_messaging_admin_password
+        name: osh_oslo_messaging_admin_password
         path: .
     - dest:
         path: .values.endpoints.oslo_messaging.auth.neutron.password
       src:
         schema: deckhand/Passphrase/v1
-        name: osh_neutron_oslo_messaging_password
+        name: osh_oslo_messaging_admin_password
         path: .
     - dest:
         path: .values.endpoints.oslo_db.auth.neutron.password

global/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml

@@ -1,120 +0,0 @@
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: nova-rabbitmq
-  labels:
-    name: nova-rabbitmq-global
-    component: nova
-  layeringDefinition:
-    abstract: false
-    layer: global
-  storagePolicy: cleartext
-  substitutions:
-    # Chart source
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .charts.osh.rabbitmq
-      dest:
-        path: .source
-
-    # Images
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .images.osh.rabbitmq
-      dest:
-        path: .values.images.tags
-
-    # Endpoints
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: osh_endpoints
-        path: .osh.nova_oslo_messaging
-      dest:
-        path: .values.endpoints.oslo_messaging
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: osh_endpoints
-        path: .osh.nova_rabbitmq_exporter
-      dest:
-        path: .values.endpoints.prometheus_rabbitmq_exporter
-    # Credentials
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: osh_service_accounts
-        path: .osh.nova.oslo_messaging.admin
-      dest:
-        path: .values.endpoints.oslo_messaging.auth.user
-
-    # Secrets
-
-    - src:
-        schema: deckhand/Passphrase/v1
-        name: osh_nova_rabbitmq_erlang_cookie
-        path: .
-      dest:
-        path: .values.endpoints.oslo_messaging.auth.erlang_cookie
-    - src:
-        schema: deckhand/Passphrase/v1
-        name: osh_nova_oslo_messaging_admin_password
-        path: .
-      dest:
-        path: .values.endpoints.oslo_messaging.auth.user.password
-data:
-  chart_name: nova-rabbitmq
-  release: nova-rabbitmq
-  namespace: openstack
-  wait:
-    timeout: 900
-    labels:
-      release_group: airship-nova-rabbitmq
-    resources:
-      - type: statefulset
-  install:
-    no_hooks: false
-  upgrade:
-    no_hooks: false
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: airship-nova-rabbitmq
-  values:
-    labels:
-      server:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-      prometheus_rabbitmq_exporter:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-    monitoring:
-      prometheus:
-        enabled: true
-  dependencies:
-    - nova-rabbitmq-htk
-...
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: nova-rabbitmq-htk
-  layeringDefinition:
-    abstract: false
-    layer: global
-  storagePolicy: cleartext
-  substitutions:
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .charts.osh.rabbitmq-htk
-      dest:
-        path: .source
-data:
-  chart_name: nova-rabbitmq-htk
-  release: nova-rabbitmq-htk
-  namespace: nova-rabbitmq-htk
-  values: {}
-  dependencies: []
-...

global/software/charts/osh/openstack-compute-kit/nova.yaml

@@ -55,7 +55,7 @@ metadata:
     - src:
         schema: pegleg/EndpointCatalogue/v1
         name: osh_endpoints
-        path: .osh.nova_oslo_messaging
+        path: .osh.oslo_messaging
       dest:
         path: .values.endpoints.oslo_messaging
     - src:
@@ -141,7 +141,7 @@ metadata:
     - src:
         schema: pegleg/AccountCatalogue/v1
         name: osh_service_accounts
-        path: .osh.nova.oslo_messaging.admin
+        path: .osh.oslo_messaging.admin
       dest:
         path: .values.endpoints.oslo_messaging.auth.admin
     - src:
@@ -189,6 +189,13 @@ metadata:
       dest:
         path: .values.endpoints.oslo_db_cell0.path
         pattern: DB_NAME
+    - src:
+        schema: pegleg/EndpointCatalogue/v1
+        name: osh_endpoints
+        path: .osh.compute.name
+      dest:
+        path: .values.endpoints.oslo_messaging.path
+        pattern: VHOST_NAME
 
     # Secrets
     - dest:
@@ -219,13 +226,13 @@ metadata:
         path: .values.endpoints.oslo_messaging.auth.admin.password
       src:
         schema: deckhand/Passphrase/v1
-        name: osh_nova_oslo_messaging_admin_password
+        name: osh_oslo_messaging_admin_password
         path: .
     - dest:
         path: .values.endpoints.oslo_messaging.auth.nova.password
       src:
         schema: deckhand/Passphrase/v1
-        name: osh_nova_oslo_messaging_password
+        name: osh_oslo_messaging_admin_password
         path: .
     - dest:
         path: .values.endpoints.oslo_db.auth.nova.password

global/software/charts/osh/openstack-glance/chart-group.yaml

@@ -13,5 +13,4 @@ metadata:
 data:
   description: Deploy Glance
   chart_group:
-    - glance-rabbitmq
     - glance

global/software/charts/osh/openstack-glance/glance.yaml

@@ -55,7 +55,7 @@ metadata:
     - src:
         schema: pegleg/EndpointCatalogue/v1
         name: osh_endpoints
-        path: .osh.glance_oslo_messaging
+        path: .osh.oslo_messaging
       dest:
         path: .values.endpoints.oslo_messaging
     - src:
@@ -97,7 +97,7 @@ metadata:
     - src:
         schema: pegleg/AccountCatalogue/v1
         name: osh_service_accounts
-        path: .osh.glance.oslo_messaging.admin
+        path: .osh.oslo_messaging.admin
       dest:
         path: .values.endpoints.oslo_messaging.auth.admin
     - src:
@@ -125,6 +125,13 @@ metadata:
         path: .osh.glance.ceph_object_store
       dest:
         path: .values.endpoints.ceph_object_store.auth.glance
+    - src:
+        schema: pegleg/EndpointCatalogue/v1
+        name: osh_endpoints
+        path: .osh.image.name
+      dest:
+        path: .values.endpoints.oslo_messaging.path
+        pattern: VHOST_NAME
 
     # Secrets
     - dest:
@@ -143,13 +150,13 @@ metadata:
         path: .values.endpoints.oslo_messaging.auth.admin.password
       src:
         schema: deckhand/Passphrase/v1
-        name: osh_glance_oslo_messaging_admin_password
+        name: osh_oslo_messaging_admin_password
         path: .
     - dest:
         path: .values.endpoints.oslo_messaging.auth.glance.password
       src:
         schema: deckhand/Passphrase/v1
-        name: osh_glance_oslo_messaging_password
+        name: osh_oslo_messaging_admin_password
         path: .
     - dest:
         path: .values.endpoints.oslo_db.auth.glance.password

global/software/charts/osh/openstack-glance/rabbitmq.yaml

@@ -1,120 +0,0 @@
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: glance-rabbitmq
-  labels:
-    name: glance-rabbitmq-global
-    component: glance
-  layeringDefinition:
-    abstract: false
-    layer: global
-  storagePolicy: cleartext
-  substitutions:
-    # Chart source
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .charts.osh.rabbitmq
-      dest:
-        path: .source
-
-    # Images
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .images.osh.rabbitmq
-      dest:
-        path: .values.images.tags
-
-    # Endpoints
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: osh_endpoints
-        path: .osh.glance_oslo_messaging
-      dest:
-        path: .values.endpoints.oslo_messaging
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: osh_endpoints
-        path: .osh.glance_rabbitmq_exporter
-      dest:
-        path: .values.endpoints.prometheus_rabbitmq_exporter
-    # Credentials
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: osh_service_accounts
-        path: .osh.glance.oslo_messaging.admin
-      dest:
-        path: .values.endpoints.oslo_messaging.auth.user
-
-    # Secrets
-
-    - src:
-        schema: deckhand/Passphrase/v1
-        name: osh_glance_rabbitmq_erlang_cookie
-        path: .
-      dest:
-        path: .values.endpoints.oslo_messaging.auth.erlang_cookie
-    - src:
-        schema: deckhand/Passphrase/v1
-        name: osh_glance_oslo_messaging_admin_password
-        path: .
-      dest:
-        path: .values.endpoints.oslo_messaging.auth.user.password
-data:
-  chart_name: glance-rabbitmq
-  release: glance-rabbitmq
-  namespace: openstack
-  wait:
-    timeout: 900
-    labels:
-      release_group: airship-glance-rabbitmq
-    resources:
-      - type: statefulset
-  install:
-    no_hooks: false
-  upgrade:
-    no_hooks: false
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: airship-glance-rabbitmq
-  values:
-    labels:
-      server:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-      prometheus_rabbitmq_exporter:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-    monitoring:
-      prometheus:
-        enabled: true
-  dependencies:
-    - glance-rabbitmq-htk
-...
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: glance-rabbitmq-htk
-  layeringDefinition:
-    abstract: false
-    layer: global
-  storagePolicy: cleartext
-  substitutions:
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .charts.osh.rabbitmq-htk
-      dest:
-        path: .source
-data:
-  chart_name: glance-rabbitmq-htk
-  release: glance-rabbitmq-htk
-  namespace: glance-rabbitmq-htk
-  values: {}
-  dependencies: []
-...

global/software/charts/osh/openstack-heat/chart-group.yaml

@@ -13,5 +13,4 @@ metadata:
 data:
   description: Deploy Heat
   chart_group:
-    - heat-rabbitmq
     - heat

global/software/charts/osh/openstack-heat/heat.yaml

@@ -61,7 +61,7 @@ metadata:
     - src:
         schema: pegleg/EndpointCatalogue/v1
         name: osh_endpoints
-        path: .osh.heat_oslo_messaging
+        path: .osh.oslo_messaging
       dest:
         path: .values.endpoints.oslo_messaging
     - src:
@@ -103,7 +103,7 @@ metadata:
     - src:
         schema: pegleg/AccountCatalogue/v1
         name: osh_service_accounts
-        path: .osh.heat.oslo_messaging.admin
+        path: .osh.oslo_messaging.admin
       dest:
         path: .values.endpoints.oslo_messaging.auth.admin
     - src:
@@ -125,6 +125,13 @@ metadata:
       dest:
         path: .values.endpoints.oslo_db.path
         pattern: DB_NAME
+    - src:
+        schema: pegleg/EndpointCatalogue/v1
+        name: osh_endpoints
+        path: .osh.orchestration.name
+      dest:
+        path: .values.endpoints.oslo_messaging.path
+        pattern: VHOST_NAME
 
     # Secrets
     - dest:
@@ -155,13 +162,13 @@ metadata:
         path: .values.endpoints.oslo_messaging.auth.admin.password
       src:
         schema: deckhand/Passphrase/v1
-        name: osh_heat_oslo_messaging_admin_password
+        name: osh_oslo_messaging_admin_password
         path: .
     - dest:
         path: .values.endpoints.oslo_messaging.auth.heat.password
       src:
         schema: deckhand/Passphrase/v1
-        name: osh_heat_oslo_messaging_password
+        name: osh_oslo_messaging_admin_password
         path: .
     - dest:
         path: .values.endpoints.oslo_db.auth.heat.password

global/software/charts/osh/openstack-heat/rabbitmq.yaml

@@ -1,120 +0,0 @@
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: heat-rabbitmq
-  labels:
-    name: heat-rabbitmq-global
-    component: heat
-  layeringDefinition:
-    abstract: false
-    layer: global
-  storagePolicy: cleartext
-  substitutions:
-    # Chart source
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .charts.osh.rabbitmq
-      dest:
-        path: .source
-
-    # Images
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .images.osh.rabbitmq
-      dest:
-        path: .values.images.tags
-
-    # Endpoints
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: osh_endpoints
-        path: .osh.heat_oslo_messaging
-      dest:
-        path: .values.endpoints.oslo_messaging
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: osh_endpoints
-        path: .osh.heat_rabbitmq_exporter
-      dest:
-        path: .values.endpoints.prometheus_rabbitmq_exporter
-    # Credentials
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: osh_service_accounts
-        path: .osh.heat.oslo_messaging.admin
-      dest:
-        path: .values.endpoints.oslo_messaging.auth.user
-
-    # Secrets
-
-    - src:
-        schema: deckhand/Passphrase/v1
-        name: osh_heat_rabbitmq_erlang_cookie
-        path: .
-      dest:
-        path: .values.endpoints.oslo_messaging.auth.erlang_cookie
-    - src:
-        schema: deckhand/Passphrase/v1
-        name: osh_heat_oslo_messaging_admin_password
-        path: .
-      dest:
-        path: .values.endpoints.oslo_messaging.auth.user.password
-data:
-  chart_name: heat-rabbitmq
-  release: heat-rabbitmq
-  namespace: openstack
-  wait:
-    timeout: 900
-    labels:
-      release_group: airship-heat-rabbitmq
-    resources:
-      - type: statefulset
-  install:
-    no_hooks: false
-  upgrade:
-    no_hooks: false
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: airship-heat-rabbitmq
-  values:
-    labels:
-      server:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-      prometheus_rabbitmq_exporter:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-    monitoring:
-      prometheus:
-        enabled: true
-  dependencies:
-    - heat-rabbitmq-htk
-...
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: heat-rabbitmq-htk
-  layeringDefinition:
-    abstract: false
-    layer: global
-  storagePolicy: cleartext
-  substitutions:
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .charts.osh.rabbitmq-htk
-      dest:
-        path: .source
-data:
-  chart_name: heat-rabbitmq-htk
-  release: heat-rabbitmq-htk
-  namespace: heat-rabbitmq-htk
-  values: {}
-  dependencies: []
-...

global/software/charts/osh/openstack-keystone/chart-group.yaml

@@ -13,5 +13,4 @@ metadata:
 data:
   description: Deploy Keystone
   chart_group:
-    - keystone-rabbitmq
     - keystone

global/software/charts/osh/openstack-keystone/keystone.yaml

@@ -43,7 +43,7 @@ metadata:
     - src:
         schema: pegleg/EndpointCatalogue/v1
         name: osh_endpoints
-        path: .osh.keystone_oslo_messaging
+        path: .osh.oslo_messaging
       dest:
         path: .values.endpoints.oslo_messaging
     - src:
@@ -69,7 +69,7 @@ metadata:
     - src:
         schema: pegleg/AccountCatalogue/v1
         name: osh_service_accounts
-        path: .osh.keystone.oslo_messaging.admin
+        path: .osh.oslo_messaging.admin
       dest:
         path: .values.endpoints.oslo_messaging.auth.admin
     - src:
@@ -103,13 +103,13 @@ metadata:
         path: .values.endpoints.oslo_messaging.auth.admin.password
       src:
         schema: deckhand/Passphrase/v1
-        name: osh_keystone_oslo_messaging_admin_password
+        name: osh_oslo_messaging_admin_password
         path: .
     - dest:
         path: .values.endpoints.oslo_messaging.auth.keystone.password
       src:
         schema: deckhand/Passphrase/v1
-        name: osh_keystone_oslo_messaging_password
+        name: osh_oslo_messaging_admin_password
         path: .
     - dest:
         path: .values.endpoints.oslo_db.auth.keystone.password
@@ -150,6 +150,18 @@ data:
     post:
       create: []
   values:
+    dependencies:
+      static:
+        api:
+          jobs:
+            - keystone-db-sync
+            - keystone-credential-setup
+            - keystone-fernet-setup
+        db_sync:
+          jobs:
+            - keystone-db-init
+            - keystone-credential-setup
+            - keystone-fernet-setup
     bootstrap:
       script: |
         openstack role create --or-show _member_
@@ -194,14 +206,6 @@ data:
             - stdout
             - fluent
           qualname: keystone
-        logger_amqp:
-          level: WARNING
-          handlers: stderr
-          qualname: amqp
-        logger_amqplib:
-          level: WARNING
-          handlers: stderr
-          qualname: amqplib
         logger_eventletwsgi:
           level: WARNING
           handlers: stderr
@@ -237,6 +241,8 @@ data:
         formatter_default:
           format: "%(message)s"
       keystone:
+        DEFAULT:
+          transport_url: localhost
         identity:
           driver: sql
           default_domain_id: default
@@ -253,6 +259,9 @@ data:
       job:
         node_selector_key: openstack-control-plane
         node_selector_value: enabled
+    manifests:
+      job_rabbit_init: false
+      secret_rabbitmq: false
   dependencies:
     - keystone-htk
 ...

global/software/charts/osh/openstack-keystone/rabbitmq.yaml

@@ -1,120 +0,0 @@
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: keystone-rabbitmq
-  labels:
-    name: keystone-rabbitmq-global
-    component: keystone
-  layeringDefinition:
-    abstract: false
-    layer: global
-  storagePolicy: cleartext
-  substitutions:
-    # Chart source
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .charts.osh.rabbitmq
-      dest:
-        path: .source
-
-    # Images
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .images.osh.rabbitmq
-      dest:
-        path: .values.images.tags
-
-    # Endpoints
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: osh_endpoints
-        path: .osh.keystone_oslo_messaging
-      dest:
-        path: .values.endpoints.oslo_messaging
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: osh_endpoints
-        path: .osh.keystone_rabbitmq_exporter
-      dest:
-        path: .values.endpoints.prometheus_rabbitmq_exporter
-    # Credentials
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: osh_service_accounts
-        path: .osh.keystone.oslo_messaging.admin
-      dest:
-        path: .values.endpoints.oslo_messaging.auth.user
-
-    # Secrets
-
-    - src:
-        schema: deckhand/Passphrase/v1
-        name: osh_keystone_rabbitmq_erlang_cookie
-        path: .
-      dest:
-        path: .values.endpoints.oslo_messaging.auth.erlang_cookie
-    - src:
-        schema: deckhand/Passphrase/v1
-        name: osh_keystone_oslo_messaging_admin_password
-        path: .
-      dest:
-        path: .values.endpoints.oslo_messaging.auth.user.password
-data:
-  chart_name: keystone-rabbitmq
-  release: keystone-rabbitmq
-  namespace: openstack
-  wait:
-    timeout: 900
-    labels:
-      release_group: airship-keystone-rabbitmq
-    resources:
-      - type: statefulset
-  install:
-    no_hooks: false
-  upgrade:
-    no_hooks: false
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: airship-keystone-rabbitmq
-  values:
-    labels:
-      server:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-      prometheus_rabbitmq_exporter:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-    monitoring:
-      prometheus:
-        enabled: true
-  dependencies:
-    - keystone-rabbitmq-htk
-...
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: keystone-rabbitmq-htk
-  layeringDefinition:
-    abstract: false
-    layer: global
-  storagePolicy: cleartext
-  substitutions:
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .charts.osh.rabbitmq-htk
-      dest:
-        path: .source
-data:
-  chart_name: keystone-rabbitmq-htk
-  release: keystone-rabbitmq-htk
-  namespace: keystone-rabbitmq-htk
-  values: {}
-  dependencies: []
-...

global/software/charts/osh/openstack-rabbitmq/chart-group.yaml

@@ -0,0 +1,16 @@
+---
+schema: armada/ChartGroup/v1
+metadata:
+  schema: metadata/Document/v1
+  name: openstack-rabbitmq
+  labels:
+    name: openstack-rabbitmq-chart-group-global
+    component: keystone
+  layeringDefinition:
+    abstract: false
+    layer: global
+  storagePolicy: cleartext
+data:
+  description: Deploy Keystone
+  chart_group:
+    - openstack-rabbitmq

global/software/charts/osh/openstack-rabbitmq/rabbitmq.yaml

@@ -2,10 +2,9 @@
 schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
-  name: cinder-rabbitmq
+  name: openstack-rabbitmq
   labels:
-    name: cinder-rabbitmq-global
+    name: openstack-rabbitmq-global
-    component: cinder
   layeringDefinition:
     abstract: false
     layer: global
@@ -31,20 +30,20 @@ metadata:
     - src:
         schema: pegleg/EndpointCatalogue/v1
         name: osh_endpoints
-        path: .osh.cinder_oslo_messaging
+        path: .osh.oslo_messaging
       dest:
         path: .values.endpoints.oslo_messaging
     - src:
         schema: pegleg/EndpointCatalogue/v1
         name: osh_endpoints
-        path: .osh.cinder_rabbitmq_exporter
+        path: .osh.openstack_rabbitmq_exporter
       dest:
         path: .values.endpoints.prometheus_rabbitmq_exporter
     # Credentials
     - src:
         schema: pegleg/AccountCatalogue/v1
         name: osh_service_accounts
-        path: .osh.cinder.oslo_messaging.admin
+        path: .osh.oslo_messaging.admin
       dest:
         path: .values.endpoints.oslo_messaging.auth.user
 
@@ -52,24 +51,24 @@ metadata:
 
     - src:
         schema: deckhand/Passphrase/v1
-        name: osh_cinder_rabbitmq_erlang_cookie
+        name: osh_rabbitmq_erlang_cookie
         path: .
       dest:
         path: .values.endpoints.oslo_messaging.auth.erlang_cookie
     - src:
         schema: deckhand/Passphrase/v1
-        name: osh_cinder_oslo_messaging_admin_password
+        name: osh_oslo_messaging_admin_password
         path: .
       dest:
         path: .values.endpoints.oslo_messaging.auth.user.password
 data:
-  chart_name: cinder-rabbitmq
+  chart_name: openstack-rabbitmq
-  release: cinder-rabbitmq
+  release: openstack-rabbitmq
   namespace: openstack
   wait:
     timeout: 900
     labels:
-      release_group: airship-cinder-rabbitmq
+      release_group: airship-openstack-rabbitmq
     resources:
       - type: statefulset
   install:
@@ -80,8 +79,11 @@ data:
       delete:
         - type: job
           labels:
-            release_group: airship-cinder-rabbitmq
+            release_group: airship-openstack-rabbitmq
   values:
+    pod:
+      replicas:
+        server: 2
     labels:
       server:
         node_selector_key: openstack-control-plane
@@ -93,13 +95,13 @@ data:
       prometheus:
         enabled: true
   dependencies:
-    - cinder-rabbitmq-htk
+    - openstack-rabbitmq-htk
 ...
 ---
 schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
-  name: cinder-rabbitmq-htk
+  name: openstack-rabbitmq-htk
   layeringDefinition:
     abstract: false
     layer: global
@@ -112,9 +114,9 @@ metadata:
       dest:
         path: .source
 data:
-  chart_name: cinder-rabbitmq-htk
+  chart_name: openstack-rabbitmq-htk
-  release: cinder-rabbitmq-htk
+  release: openstack-rabbitmq-htk
-  namespace: cinder-rabbitmq-htk
+  namespace: openstack-rabbitmq-htk
   values: {}
   dependencies: []
 ...

global/software/manifests/full-site.yaml

@@ -42,6 +42,7 @@ data:
     - openstack-ceph-config
     - openstack-tenant-ceph
     - openstack-mariadb
+    - openstack-rabbitmq
     - openstack-memcached
     - openstack-keystone
     - openstack-radosgw

site/aiab/secrets/passphrases/osh_oslo_messaging_admin_password.yaml

@@ -2,7 +2,7 @@
 schema: deckhand/Passphrase/v1
 metadata:
   schema: metadata/Document/v1
-  name: osh_glance_rabbitmq_erlang_cookie
+  name: osh_oslo_messaging_admin_password
   layeringDefinition:
     abstract: false
     layer: site

site/aiab/secrets/passphrases/osh_rabbitmq_erlang_cookie.yaml

@@ -2,7 +2,7 @@
 schema: deckhand/Passphrase/v1
 metadata:
   schema: metadata/Document/v1
-  name: osh_heat_rabbitmq_erlang_cookie
+  name: osh_rabbitmq_erlang_cookie
   layeringDefinition:
     abstract: false
     layer: site

site/aiab/software/charts/osh/openstack-glance/chart-group.yaml

@@ -15,5 +15,4 @@ metadata:
   storagePolicy: cleartext
 data:
   chart_group:
-    - glance-rabbitmq
     - glance-aiab

site/aiab/software/charts/osh/openstack-heat/chart-group.yaml

@@ -16,5 +16,4 @@ metadata:
 data:
   sequenced: true
   chart_group:
-    - heat-rabbitmq
     - heat-aiab

site/aiab/software/full-site.yaml

@@ -34,6 +34,7 @@ data:
     - ucp-shipyard
     - openstack-ingress-controller
     - openstack-mariadb
+    - openstack-rabbitmq
     - openstack-memcached
     - openstack-keystone
     - openstack-glance-aiab

site/airskiff/secrets/passphrases/osh_barbican_oslo_messaging_admin_password.yaml

@@ -1,11 +0,0 @@
----
-schema: deckhand/Passphrase/v1
-metadata:
-  schema: metadata/Document/v1
-  name: osh_barbican_oslo_messaging_admin_password
-  layeringDefinition:
-    abstract: false
-    layer: site
-  storagePolicy: cleartext
-data: password123
-...

site/airskiff/secrets/passphrases/osh_barbican_oslo_messaging_password.yaml

@@ -1,11 +0,0 @@
----
-schema: deckhand/Passphrase/v1
-metadata:
-  schema: metadata/Document/v1
-  name: osh_barbican_oslo_messaging_password
-  layeringDefinition:
-    abstract: false
-    layer: site
-  storagePolicy: cleartext
-data: password123
-...

site/airskiff/secrets/passphrases/osh_barbican_rabbitmq_erlang_cookie.yaml

@@ -1,11 +0,0 @@
----
-schema: deckhand/Passphrase/v1
-metadata:
-  schema: metadata/Document/v1
-  name: osh_barbican_rabbitmq_erlang_cookie
-  layeringDefinition:
-    abstract: false
-    layer: site
-  storagePolicy: cleartext
-data: password123
-...

site/airskiff/secrets/passphrases/osh_cinder_oslo_messaging_admin_password.yaml

@@ -1,11 +0,0 @@
----
-schema: deckhand/Passphrase/v1
-metadata:
-  schema: metadata/Document/v1
-  name: osh_cinder_oslo_messaging_admin_password
-  layeringDefinition:
-    abstract: false
-    layer: site
-  storagePolicy: cleartext
-data: password123
-...

site/airskiff/secrets/passphrases/osh_cinder_oslo_messaging_password.yaml

@@ -1,11 +0,0 @@
----
-schema: deckhand/Passphrase/v1
-metadata:
-  schema: metadata/Document/v1
-  name: osh_cinder_oslo_messaging_password
-  layeringDefinition:
-    abstract: false
-    layer: site
-  storagePolicy: cleartext
-data: password123
-...

site/airskiff/secrets/passphrases/osh_glance_oslo_messaging_admin_password.yaml

@@ -1,11 +0,0 @@
----
-schema: deckhand/Passphrase/v1
-metadata:
-  schema: metadata/Document/v1
-  name: osh_glance_oslo_messaging_admin_password
-  layeringDefinition:
-    abstract: false
-    layer: site
-  storagePolicy: cleartext
-data: password123
-...

site/airskiff/secrets/passphrases/osh_glance_oslo_messaging_password.yaml

@@ -1,11 +0,0 @@
----
-schema: deckhand/Passphrase/v1
-metadata:
-  schema: metadata/Document/v1
-  name: osh_glance_oslo_messaging_password
-  layeringDefinition:
-    abstract: false
-    layer: site
-  storagePolicy: cleartext
-data: password123
-...

site/airskiff/secrets/passphrases/osh_heat_oslo_messaging_admin_password.yaml

@@ -1,11 +0,0 @@
----
-schema: deckhand/Passphrase/v1
-metadata:
-  schema: metadata/Document/v1
-  name: osh_heat_oslo_messaging_admin_password
-  layeringDefinition:
-    abstract: false
-    layer: site
-  storagePolicy: cleartext
-data: password123
-...

site/airskiff/secrets/passphrases/osh_keystone_oslo_messaging_admin_password.yaml

@@ -1,11 +0,0 @@
----
-schema: deckhand/Passphrase/v1
-metadata:
-  schema: metadata/Document/v1
-  name: osh_keystone_oslo_messaging_admin_password
-  layeringDefinition:
-    abstract: false
-    layer: site
-  storagePolicy: cleartext
-data: password123
-...

site/airskiff/secrets/passphrases/osh_keystone_oslo_messaging_password.yaml

@@ -1,11 +0,0 @@
----
-schema: deckhand/Passphrase/v1
-metadata:
-  schema: metadata/Document/v1
-  name: osh_keystone_oslo_messaging_password
-  layeringDefinition:
-    abstract: false
-    layer: site
-  storagePolicy: cleartext
-data: password123
-...

site/airskiff/secrets/passphrases/osh_keystone_rabbitmq_erlang_cookie.yaml

@@ -1,11 +0,0 @@
----
-schema: deckhand/Passphrase/v1
-metadata:
-  schema: metadata/Document/v1
-  name: osh_keystone_rabbitmq_erlang_cookie
-  layeringDefinition:
-    abstract: false
-    layer: site
-  storagePolicy: cleartext
-data: password123
-...

site/airskiff/secrets/passphrases/osh_neutron_oslo_messaging_admin_password.yaml

@@ -1,11 +0,0 @@
----
-schema: deckhand/Passphrase/v1
-metadata:
-  schema: metadata/Document/v1
-  name: osh_neutron_oslo_messaging_admin_password
-  layeringDefinition:
-    abstract: false
-    layer: site
-  storagePolicy: cleartext
-data: password123
-...

site/airskiff/secrets/passphrases/osh_neutron_oslo_messaging_password.yaml

@@ -1,11 +0,0 @@
----
-schema: deckhand/Passphrase/v1
-metadata:
-  schema: metadata/Document/v1
-  name: osh_neutron_oslo_messaging_password
-  layeringDefinition:
-    abstract: false
-    layer: site
-  storagePolicy: cleartext
-data: password123
-...

site/airskiff/secrets/passphrases/osh_neutron_rabbitmq_erlang_cookie.yaml

@@ -1,11 +0,0 @@
----
-schema: deckhand/Passphrase/v1
-metadata:
-  schema: metadata/Document/v1
-  name: osh_neutron_rabbitmq_erlang_cookie
-  layeringDefinition:
-    abstract: false
-    layer: site
-  storagePolicy: cleartext
-data: password123
-...

site/airskiff/secrets/passphrases/osh_nova_oslo_messaging_admin_password.yaml

@@ -1,11 +0,0 @@
----
-schema: deckhand/Passphrase/v1
-metadata:
-  schema: metadata/Document/v1
-  name: osh_nova_oslo_messaging_admin_password
-  layeringDefinition:
-    abstract: false
-    layer: site
-  storagePolicy: cleartext
-data: password123
-...

site/airskiff/secrets/passphrases/osh_oslo_messaging_password.yaml

@@ -2,7 +2,7 @@
 schema: deckhand/Passphrase/v1
 metadata:
   schema: metadata/Document/v1
-  name: osh_cinder_rabbitmq_erlang_cookie
+  name: osh_oslo_messaging_admin_password
   layeringDefinition:
     abstract: false
     layer: site

site/airskiff/secrets/passphrases/osh_rabbitmq_erlang_cookie.yaml

@@ -2,7 +2,7 @@
 schema: deckhand/Passphrase/v1
 metadata:
   schema: metadata/Document/v1
-  name: osh_nova_rabbitmq_erlang_cookie
+  name: osh_rabbitmq_erlang_cookie
   layeringDefinition:
     abstract: false
     layer: site

site/airskiff/software/charts/osh/openstack-compute-kit/chart-group.yaml

@@ -19,7 +19,5 @@ data:
   chart_group:
     - libvirt-airskiff
     - openvswitch
-    - neutron-rabbitmq-airskiff
-    - nova-rabbitmq-airskiff
     - neutron-airskiff
     - nova

site/airskiff/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml

@@ -1,28 +0,0 @@
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: neutron-rabbitmq-airskiff
-  layeringDefinition:
-    abstract: false
-    layer: site
-    parentSelector:
-      name: neutron-rabbitmq-global
-      component: neutron
-    actions:
-      - method: delete
-        path: .values.labels.prometheus_rabbitmq_exporter
-      - method: merge
-        path: .
-  storagePolicy: cleartext
-data:
-  test:
-    enabled: false
-  values:
-    pod:
-      replicas:
-        server: 1
-    monitoring:
-      prometheus:
-        enabled: false
-...

site/airskiff/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml

@@ -1,28 +0,0 @@
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: nova-rabbitmq-airskiff
-  layeringDefinition:
-    abstract: false
-    layer: site
-    parentSelector:
-      name: nova-rabbitmq-global
-      component: nova
-    actions:
-      - method: delete
-        path: .values.labels.prometheus_rabbitmq_exporter
-      - method: merge
-        path: .
-  storagePolicy: cleartext
-data:
-  test:
-    enabled: false
-  values:
-    pod:
-      replicas:
-        server: 1
-    monitoring:
-      prometheus:
-        enabled: false
-...

site/airskiff/software/charts/osh/openstack-glance/chart-group.yaml

@@ -18,5 +18,4 @@ metadata:
 data:
   sequenced: true
   chart_group:
-    - glance-rabbitmq-airskiff
     - glance-airskiff

site/airskiff/software/charts/osh/openstack-glance/rabbitmq.yaml

@@ -1,28 +0,0 @@
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: glance-rabbitmq-airskiff
-  layeringDefinition:
-    abstract: false
-    layer: site
-    parentSelector:
-      name: glance-rabbitmq-global
-      component: glance
-    actions:
-      - method: delete
-        path: .values.labels.prometheus_rabbitmq_exporter
-      - method: merge
-        path: .
-  storagePolicy: cleartext
-data:
-  test:
-    enabled: false
-  values:
-    pod:
-      replicas:
-        server: 1
-    monitoring:
-      prometheus:
-        enabled: false
-...

site/airskiff/software/charts/osh/openstack-heat/chart-group.yaml

@@ -18,5 +18,4 @@ metadata:
 data:
   sequenced: true
   chart_group:
-    - heat-rabbitmq-airskiff
     - heat

site/airskiff/software/charts/osh/openstack-keystone/chart-group.yaml

@@ -18,5 +18,4 @@ metadata:
 data:
   sequenced: true
   chart_group:
-    - keystone-rabbitmq-airskiff
     - keystone-airskiff

site/airskiff/software/charts/osh/openstack-keystone/rabbitmq.yaml

@@ -1,28 +0,0 @@
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: keystone-rabbitmq-airskiff
-  layeringDefinition:
-    abstract: false
-    layer: site
-    parentSelector:
-      name: keystone-rabbitmq-global
-      component: keystone
-    actions:
-      - method: delete
-        path: .values.labels.prometheus_rabbitmq_exporter
-      - method: merge
-        path: .
-  storagePolicy: cleartext
-data:
-  test:
-    enabled: false
-  values:
-    pod:
-      replicas:
-        server: 1
-    monitoring:
-      prometheus:
-        enabled: false
-...

site/airskiff/software/charts/osh/openstack-rabbitmq/chart-group.yaml

@@ -0,0 +1,21 @@
+---
+schema: armada/ChartGroup/v1
+metadata:
+  schema: metadata/Document/v1
+  name: openstack-rabbitmq-airskiff
+  layeringDefinition:
+    abstract: false
+    layer: site
+    parentSelector:
+      name: openstack-rabbitmq-chart-group-global
+      component: keystone
+    actions:
+      - method: merge
+        path: .sequenced
+      - method: replace
+        path: .chart_group
+  storagePolicy: cleartext
+data:
+  sequenced: true
+  chart_group:
+    - openstack-rabbitmq-airskiff

site/airskiff/software/charts/osh/openstack-rabbitmq/rabbitmq.yaml

@@ -2,13 +2,12 @@
 schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
-  name: heat-rabbitmq-airskiff
+  name: openstack-rabbitmq-airskiff
   layeringDefinition:
     abstract: false
     layer: site
     parentSelector:
-      name: heat-rabbitmq-global
+      name: openstack-rabbitmq-global
-      component: heat
     actions:
       - method: delete
         path: .values.labels.prometheus_rabbitmq_exporter

site/airskiff/software/config/endpoints.yaml

@@ -385,23 +385,26 @@ data:
       port:
         metrics:
           default: 9104
-    keystone_oslo_messaging:
+    oslo_messaging:
+      statefulset:
+        replicas: 2
+        name: airship-openstack-rabbitmq-rabbitmq
       namespace: openstack
       hosts:
-        default: keystone-rabbitmq
+        default: openstack-rabbitmq
       host_fqdn_override:
         default: null
-      path: /keystone
+      path: /VHOST_NAME
       scheme: rabbit
       port:
         amqp:
           default: 5672
         http:
           default: 15672
-    keystone_rabbitmq_exporter:
+    openstack_rabbitmq_exporter:
       namespace: openstack
       hosts:
-        default: keystone-rabbitmq-exporter
+        default: openstack-rabbitmq-exporter
       host_fqdn_override:
         default: null
       path:
@@ -434,32 +437,6 @@ data:
         api:
           default: 80
           internal: 5000
-    glance_oslo_messaging:
-      namespace: openstack
-      hosts:
-        default: glance-rabbitmq
-      host_fqdn_override:
-        default: null
-      path: /glance
-      scheme: rabbit
-      port:
-        amqp:
-          default: 5672
-        http:
-          default: 15672
-    glance_rabbitmq_exporter:
-      namespace: openstack
-      hosts:
-        default: glance-rabbitmq-exporter
-      host_fqdn_override:
-        default: null
-      path:
-        default: /metrics
-      scheme:
-        default: "http"
-      port:
-        metrics:
-          default: 9095
     image:
       name: glance
       hosts:
@@ -491,32 +468,6 @@ data:
         api:
           default: 9191
           public: 80
-    cinder_oslo_messaging:
-      namespace: openstack
-      hosts:
-        default: cinder-rabbitmq
-      host_fqdn_override:
-        default: null
-      path: /cinder
-      scheme: rabbit
-      port:
-        amqp:
-          default: 5672
-        http:
-          default: 15672
-    cinder_rabbitmq_exporter:
-      namespace: openstack
-      hosts:
-        default: cinder-rabbitmq-exporter
-      host_fqdn_override:
-        default: null
-      path:
-        default: /metrics
-      scheme:
-        default: "http"
-      port:
-        metrics:
-          default: 9095
     volume:
       name: cinder
       hosts:
@@ -565,32 +516,6 @@ data:
         api:
           default: 8776
           public: 80
-    heat_oslo_messaging:
-      namespace: openstack
-      hosts:
-        default: heat-rabbitmq
-      host_fqdn_override:
-        default: null
-      path: /heat
-      scheme: rabbit
-      port:
-        amqp:
-          default: 5672
-        http:
-          default: 15672
-    heat_rabbitmq_exporter:
-      namespace: openstack
-      hosts:
-        default: heat-rabbitmq-exporter
-      host_fqdn_override:
-        default: null
-      path:
-        default: /metrics
-      scheme:
-        default: "http"
-      port:
-        metrics:
-          default: 9095
     orchestration:
       name: heat
       hosts:
@@ -639,32 +564,6 @@ data:
         api:
           default: 8003
           public: 80
-    neutron_oslo_messaging:
-      namespace: openstack
-      hosts:
-        default: neutron-rabbitmq
-      host_fqdn_override:
-        default: null
-      path: /neutron
-      scheme: rabbit
-      port:
-        amqp:
-          default: 5672
-        http:
-          default: 15672
-    neutron_rabbitmq_exporter:
-      namespace: openstack
-      hosts:
-        default: neutron-rabbitmq-exporter
-      host_fqdn_override:
-        default: null
-      path:
-        default: /metrics
-      scheme:
-        default: "http"
-      port:
-        metrics:
-          default: 9095
     network:
       name: neutron
       hosts:
@@ -681,32 +580,6 @@ data:
         api:
           default: 9696
           public: 80
-    nova_oslo_messaging:
-      namespace: openstack
-      hosts:
-        default: nova-rabbitmq
-      host_fqdn_override:
-        default: null
-      path: /nova
-      scheme: rabbit
-      port:
-        amqp:
-          default: 5672
-        http:
-          default: 15672
-    nova_rabbitmq_exporter:
-      namespace: openstack
-      hosts:
-        default: nova-rabbitmq-exporter
-      host_fqdn_override:
-        default: null
-      path:
-        default: /metrics
-      scheme:
-        default: "http"
-      port:
-        metrics:
-          default: 9095
     compute:
       name: nova
       hosts:

site/airskiff/software/config/service_accounts.yaml

@@ -231,8 +231,6 @@ data:
         username: keystone
         database: keystone
       oslo_messaging:
-        admin:
-          username: keystone-rabbitmq-admin
         keystone:
           username: keystone-rabbitmq-user
       ldap:
@@ -251,8 +249,6 @@ data:
         username: cinder
         database: cinder
       oslo_messaging:
-        admin:
-          username: cinder-rabbitmq-admin
         cinder:
           username: cinder-rabbitmq-user
     glance:
@@ -266,8 +262,6 @@ data:
         username: glance
         database: glance
       oslo_messaging:
-        admin:
-          username: glance-rabbitmq-admin
         glance:
           username: glance-rabbitmq-user
       ceph_object_store:
@@ -293,8 +287,6 @@ data:
         username: heat
         database: heat
       oslo_messaging:
-        admin:
-          username: heat-rabbitmq-admin
         heat:
           username: heat-rabbitmq-user
     swift:
@@ -321,8 +313,6 @@ data:
         username: neutron
         database: neutron
       oslo_messaging:
-        admin:
-          username: neutron-rabbitmq-admin
         neutron:
           username: neutron-rabbitmq-user
     nova:
@@ -348,8 +338,6 @@ data:
         username: nova
         database: "nova_cell0"
       oslo_messaging:
-        admin:
-          username: nova-rabbitmq-admin
         nova:
           username: nova-rabbitmq-user
     horizon:
@@ -367,10 +355,11 @@ data:
         username: barbican
         database: barbican
       oslo_messaging:
-        admin:
-          username: barbican-rabbitmq-admin
         barbican:
           username: barbican-rabbitmq-user
+    oslo_messaging:
+      admin:
+        username: admin
     tempest:
       tempest:
         role: admin

site/airskiff/software/manifests/full-site.yaml

@@ -18,6 +18,7 @@ data:
   chart_groups:
     - openstack-ingress-controller-airskiff
     - openstack-mariadb-airskiff
+    - openstack-rabbitmq-airskiff
     - openstack-memcached
     - openstack-keystone-airskiff
     - openstack-glance-airskiff

site/airsloop/secrets/passphrases/osh_oslo_messaging_admin_password.yaml

@@ -0,0 +1,11 @@
+---
+schema: deckhand/Passphrase/v1
+metadata:
+  schema: metadata/Document/v1
+  name: osh_oslo_messaging_admin_password
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: cleartext
+data: password123
+...

site/airsloop/secrets/passphrases/osh_rabbitmq_erlang_cookie.yaml

@@ -2,7 +2,7 @@
 schema: deckhand/Passphrase/v1
 metadata:
   schema: metadata/Document/v1
-  name: osh_heat_oslo_messaging_password
+  name: osh_rabbitmq_erlang_cookie
   layeringDefinition:
     abstract: false
     layer: site

site/seaworthy/secrets/passphrases/osh_oslo_messaging_admin_password.yaml

@@ -0,0 +1,11 @@
+---
+schema: deckhand/Passphrase/v1
+metadata:
+  schema: metadata/Document/v1
+  name: osh_oslo_messaging_admin_password
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: cleartext
+data: password123
+...

site/seaworthy/secrets/passphrases/osh_rabbitmq_erlang_cookie.yaml

@@ -2,7 +2,7 @@
 schema: deckhand/Passphrase/v1
 metadata:
   schema: metadata/Document/v1
-  name: osh_nova_oslo_messaging_password
+  name: osh_rabbitmq_erlang_cookie
   layeringDefinition:
     abstract: false
     layer: site

site/seaworthy/software/config/endpoints.yaml

@@ -548,23 +548,26 @@ data:
       port:
         metrics:
           default: 9104
-    keystone_oslo_messaging:
+    oslo_messaging:
+      statefulset:
+        replicas: 2
+        name: airship-openstack-rabbitmq-rabbitmq
       namespace: openstack
       hosts:
-        default: keystone-rabbitmq
+        default: openstack-rabbitmq
       host_fqdn_override:
         default: null
-      path: /keystone
+      path: /VHOST_NAME
       scheme: rabbit
       port:
         amqp:
           default: 5672
         http:
           default: 15672
-    keystone_rabbitmq_exporter:
+    openstack_rabbitmq_exporter:
       namespace: openstack
       hosts:
-        default: keystone-rabbitmq-exporter
+        default: openstack-rabbitmq-exporter
       host_fqdn_override:
         default: null
       path:
@@ -604,32 +607,6 @@ data:
         api:
           default: 443
           internal: 5000
-    glance_oslo_messaging:
-      namespace: openstack
-      hosts:
-        default: glance-rabbitmq
-      host_fqdn_override:
-        default: null
-      path: /glance
-      scheme: rabbit
-      port:
-        amqp:
-          default: 5672
-        http:
-          default: 15672
-    glance_rabbitmq_exporter:
-      namespace: openstack
-      hosts:
-        default: glance-rabbitmq-exporter
-      host_fqdn_override:
-        default: null
-      path:
-        default: /metrics
-      scheme:
-        default: "http"
-      port:
-        metrics:
-          default: 9095
     image:
       name: glance
       hosts:
@@ -663,32 +640,6 @@ data:
         api:
           default: 9191
           public: 80
-    cinder_oslo_messaging:
-      namespace: openstack
-      hosts:
-        default: cinder-rabbitmq
-      host_fqdn_override:
-        default: null
-      path: /cinder
-      scheme: rabbit
-      port:
-        amqp:
-          default: 5672
-        http:
-          default: 15672
-    cinder_rabbitmq_exporter:
-      namespace: openstack
-      hosts:
-        default: cinder-rabbitmq-exporter
-      host_fqdn_override:
-        default: null
-      path:
-        default: /metrics
-      scheme:
-        default: "http"
-      port:
-        metrics:
-          default: 9095
     volume:
       name: cinder
       hosts:
@@ -743,32 +694,6 @@ data:
         api:
           default: 8776
           public: 443
-    heat_oslo_messaging:
-      namespace: openstack
-      hosts:
-        default: heat-rabbitmq
-      host_fqdn_override:
-        default: null
-      path: /heat
-      scheme: rabbit
-      port:
-        amqp:
-          default: 5672
-        http:
-          default: 15672
-    heat_rabbitmq_exporter:
-      namespace: openstack
-      hosts:
-        default: heat-rabbitmq-exporter
-      host_fqdn_override:
-        default: null
-      path:
-        default: /metrics
-      scheme:
-        default: "http"
-      port:
-        metrics:
-          default: 9095
     orchestration:
       name: heat
       hosts:
@@ -821,32 +746,6 @@ data:
         api:
           default: 8003
           public: 80
-    neutron_oslo_messaging:
-      namespace: openstack
-      hosts:
-        default: neutron-rabbitmq
-      host_fqdn_override:
-        default: null
-      path: /neutron
-      scheme: rabbit
-      port:
-        amqp:
-          default: 5672
-        http:
-          default: 15672
-    neutron_rabbitmq_exporter:
-      namespace: openstack
-      hosts:
-        default: neutron-rabbitmq-exporter
-      host_fqdn_override:
-        default: null
-      path:
-        default: /metrics
-      scheme:
-        default: "http"
-      port:
-        metrics:
-          default: 9095
     network:
       name: neutron
       hosts:
@@ -865,32 +764,6 @@ data:
         api:
           default: 9696
           public: 443
-    nova_oslo_messaging:
-      namespace: openstack
-      hosts:
-        default: nova-rabbitmq
-      host_fqdn_override:
-        default: null
-      path: /nova
-      scheme: rabbit
-      port:
-        amqp:
-          default: 5672
-        http:
-          default: 15672
-    nova_rabbitmq_exporter:
-      namespace: openstack
-      hosts:
-        default: nova-rabbitmq-exporter
-      host_fqdn_override:
-        default: null
-      path:
-        default: /metrics
-      scheme:
-        default: "http"
-      port:
-        metrics:
-          default: 9095
     compute:
       name: nova
       hosts:

site/seaworthy/software/config/service_accounts.yaml

@@ -231,8 +231,6 @@ data:
         username: keystone
         database: keystone
       oslo_messaging:
-        admin:
-          username: keystone-rabbitmq-admin
         keystone:
           username: keystone-rabbitmq-user
       ldap:
@@ -251,8 +249,6 @@ data:
         username: cinder
         database: cinder
       oslo_messaging:
-        admin:
-          username: cinder-rabbitmq-admin
         cinder:
           username: cinder-rabbitmq-user
     glance:
@@ -266,8 +262,6 @@ data:
         username: glance
         database: glance
       oslo_messaging:
-        admin:
-          username: glance-rabbitmq-admin
         glance:
           username: glance-rabbitmq-user
       ceph_object_store:
@@ -293,8 +287,6 @@ data:
         username: heat
         database: heat
       oslo_messaging:
-        admin:
-          username: heat-rabbitmq-admin
         heat:
           username: heat-rabbitmq-user
     swift:
@@ -321,8 +313,6 @@ data:
         username: neutron
         database: neutron
       oslo_messaging:
-        admin:
-          username: neutron-rabbitmq-admin
         neutron:
           username: neutron-rabbitmq-user
     nova:
@@ -348,8 +338,6 @@ data:
         username: nova
         database: "nova_cell0"
       oslo_messaging:
-        admin:
-          username: nova-rabbitmq-admin
         nova:
           username: nova-rabbitmq-user
     horizon:
@@ -367,10 +355,11 @@ data:
         username: barbican
         database: barbican
       oslo_messaging:
-        admin:
-          username: barbican-rabbitmq-admin
         barbican:
           username: barbican-rabbitmq-user
+    oslo_messaging:
+      admin:
+        username: admin
     tempest:
       tempest:
         role: admin

type/sloop/charts/osh/comps/glance-rabbitmq.yaml

@@ -1,23 +0,0 @@
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  replacement: true
-  name: glance-rabbitmq
-  labels:
-    name: glance-rabbitmq-type
-  layeringDefinition:
-    abstract: false
-    layer: type
-    parentSelector:
-      name: glance-rabbitmq-global
-    actions:
-      - method: merge
-        path: .
-  storagePolicy: cleartext
-data:
-  values:
-    pod:
-      replicas:
-        server: 1
-...

type/sloop/charts/osh/comps/heat-rabbitmq.yaml

@@ -1,23 +0,0 @@
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  replacement: true
-  name: heat-rabbitmq
-  labels:
-    name: heat-rabbitmq-type
-  layeringDefinition:
-    abstract: false
-    layer: type
-    parentSelector:
-      name: heat-rabbitmq-global
-    actions:
-      - method: merge
-        path: .
-  storagePolicy: cleartext
-data:
-  values:
-    pod:
-      replicas:
-        server: 1
-...

type/sloop/charts/osh/comps/keystone-rabbitmq.yaml

@@ -1,23 +0,0 @@
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  replacement: true
-  name: keystone-rabbitmq
-  labels:
-    name: keystone-rabbitmq-type
-  layeringDefinition:
-    abstract: false
-    layer: type
-    parentSelector:
-      name: keystone-rabbitmq-global
-    actions:
-      - method: merge
-        path: .
-  storagePolicy: cleartext
-data:
-  values:
-    pod:
-      replicas:
-        server: 1
-...

type/sloop/charts/osh/comps/neutron-rabbitmq.yaml

@@ -1,23 +0,0 @@
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  replacement: true
-  name: neutron-rabbitmq
-  labels:
-    name: neutron-rabbitmq-type
-  layeringDefinition:
-    abstract: false
-    layer: type
-    parentSelector:
-      name: neutron-rabbitmq-global
-    actions:
-      - method: merge
-        path: .
-  storagePolicy: cleartext
-data:
-  values:
-    pod:
-      replicas:
-        server: 1
-...

type/sloop/charts/osh/comps/nova-rabbitmq.yaml

@@ -1,23 +0,0 @@
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  replacement: true
-  name: nova-rabbitmq
-  labels:
-    name: nova-rabbitmq-type
-  layeringDefinition:
-    abstract: false
-    layer: type
-    parentSelector:
-      name: nova-rabbitmq-global
-    actions:
-      - method: merge
-        path: .
-  storagePolicy: cleartext
-data:
-  values:
-    pod:
-      replicas:
-        server: 1
-...

type/sloop/charts/osh/comps/openstack-rabbitmq.yaml

@@ -3,14 +3,14 @@ schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
   replacement: true
-  name: cinder-rabbitmq
+  name: openstack-rabbitmq
   labels:
-    name: cinder-rabbitmq-type
+    name: openstack-rabbitmq-type
   layeringDefinition:
     abstract: false
     layer: type
     parentSelector:
-      name: cinder-rabbitmq-global
+      name: openstack-rabbitmq-global
     actions:
       - method: merge
         path: .

type/sloop/config/endpoints.yaml

@@ -387,23 +387,26 @@ data:
       port:
         metrics:
           default: 9104
-    keystone_oslo_messaging:
+    oslo_messaging:
+      statefulset:
+        replicas: 2
+        name: airship-openstack-rabbitmq-rabbitmq
       namespace: openstack
       hosts:
-        default: keystone-rabbitmq
+        default: openstack-rabbitmq
       host_fqdn_override:
         default: null
-      path: /keystone
+      path: /VHOST_NAME
       scheme: rabbit
       port:
         amqp:
           default: 5672
         http:
           default: 15672
-    keystone_rabbitmq_exporter:
+    openstack_rabbitmq_exporter:
       namespace: openstack
       hosts:
-        default: keystone-rabbitmq-exporter
+        default: openstack-rabbitmq-exporter
       host_fqdn_override:
         default: null
       path:
@@ -436,32 +439,6 @@ data:
         api:
           default: 80
           internal: 5000
-    glance_oslo_messaging:
-      namespace: openstack
-      hosts:
-        default: glance-rabbitmq
-      host_fqdn_override:
-        default: null
-      path: /glance
-      scheme: rabbit
-      port:
-        amqp:
-          default: 5672
-        http:
-          default: 15672
-    glance_rabbitmq_exporter:
-      namespace: openstack
-      hosts:
-        default: glance-rabbitmq-exporter
-      host_fqdn_override:
-        default: null
-      path:
-        default: /metrics
-      scheme:
-        default: "http"
-      port:
-        metrics:
-          default: 9095
     image:
       name: glance
       hosts:
@@ -493,32 +470,6 @@ data:
         api:
           default: 9191
           public: 80
-    cinder_oslo_messaging:
-      namespace: openstack
-      hosts:
-        default: cinder-rabbitmq
-      host_fqdn_override:
-        default: null
-      path: /cinder
-      scheme: rabbit
-      port:
-        amqp:
-          default: 5672
-        http:
-          default: 15672
-    cinder_rabbitmq_exporter:
-      namespace: openstack
-      hosts:
-        default: cinder-rabbitmq-exporter
-      host_fqdn_override:
-        default: null
-      path:
-        default: /metrics
-      scheme:
-        default: "http"
-      port:
-        metrics:
-          default: 9095
     volume:
       name: cinder
       hosts:
@@ -567,32 +518,6 @@ data:
         api:
           default: 8776
           public: 80
-    heat_oslo_messaging:
-      namespace: openstack
-      hosts:
-        default: heat-rabbitmq
-      host_fqdn_override:
-        default: null
-      path: /heat
-      scheme: rabbit
-      port:
-        amqp:
-          default: 5672
-        http:
-          default: 15672
-    heat_rabbitmq_exporter:
-      namespace: openstack
-      hosts:
-        default: heat-rabbitmq-exporter
-      host_fqdn_override:
-        default: null
-      path:
-        default: /metrics
-      scheme:
-        default: "http"
-      port:
-        metrics:
-          default: 9095
     orchestration:
       name: heat
       hosts:
@@ -641,32 +566,6 @@ data:
         api:
           default: 8003
           public: 80
-    neutron_oslo_messaging:
-      namespace: openstack
-      hosts:
-        default: neutron-rabbitmq
-      host_fqdn_override:
-        default: null
-      path: /neutron
-      scheme: rabbit
-      port:
-        amqp:
-          default: 5672
-        http:
-          default: 15672
-    neutron_rabbitmq_exporter:
-      namespace: openstack
-      hosts:
-        default: neutron-rabbitmq-exporter
-      host_fqdn_override:
-        default: null
-      path:
-        default: /metrics
-      scheme:
-        default: "http"
-      port:
-        metrics:
-          default: 9095
     network:
       name: neutron
       hosts:
@@ -683,32 +582,6 @@ data:
         api:
           default: 9696
           public: 80
-    nova_oslo_messaging:
-      namespace: openstack
-      hosts:
-        default: nova-rabbitmq
-      host_fqdn_override:
-        default: null
-      path: /nova
-      scheme: rabbit
-      port:
-        amqp:
-          default: 5672
-        http:
-          default: 15672
-    nova_rabbitmq_exporter:
-      namespace: openstack
-      hosts:
-        default: nova-rabbitmq-exporter
-      host_fqdn_override:
-        default: null
-      path:
-        default: /metrics
-      scheme:
-        default: "http"
-      port:
-        metrics:
-          default: 9095
     compute:
       name: nova
       hosts:

type/sloop/config/service_accounts.yaml

@@ -233,8 +233,6 @@ data:
         username: keystone
         database: keystone
       oslo_messaging:
-        admin:
-          username: keystone-rabbitmq-admin
         keystone:
           username: keystone-rabbitmq-user
       ldap:
@@ -253,8 +251,6 @@ data:
         username: cinder
         database: cinder
       oslo_messaging:
-        admin:
-          username: cinder-rabbitmq-admin
         cinder:
           username: cinder-rabbitmq-user
     glance:
@@ -268,8 +264,6 @@ data:
         username: glance
         database: glance
       oslo_messaging:
-        admin:
-          username: glance-rabbitmq-admin
         glance:
           username: glance-rabbitmq-user
       ceph_object_store:
@@ -295,8 +289,6 @@ data:
         username: heat
         database: heat
       oslo_messaging:
-        admin:
-          username: heat-rabbitmq-admin
         heat:
           username: heat-rabbitmq-user
     swift:
@@ -323,8 +315,6 @@ data:
         username: neutron
         database: neutron
       oslo_messaging:
-        admin:
-          username: neutron-rabbitmq-admin
         neutron:
           username: neutron-rabbitmq-user
     nova:
@@ -350,8 +340,6 @@ data:
         username: nova
         database: "nova_cell0"
       oslo_messaging:
-        admin:
-          username: nova-rabbitmq-admin
         nova:
           username: nova-rabbitmq-user
     horizon:
@@ -369,10 +357,11 @@ data:
         username: barbican
         database: barbican
       oslo_messaging:
-        admin:
-          username: barbican-rabbitmq-admin
         barbican:
           username: barbican-rabbitmq-user
+    oslo_messaging:
+      admin:
+        username: admin
     tempest:
       tempest:
         role: admin

type/sloop/manifests/full-site.yaml

@@ -48,6 +48,7 @@ data:
     - openstack-ceph-config
     - openstack-tenant-ceph
     - openstack-mariadb
+    - openstack-rabbitmq
     - openstack-memcached
     - openstack-keystone
     - openstack-radosgw