From c357733d7130e7a65346e5db25b5d3e7ab3fc2d6 Mon Sep 17 00:00:00 2001 From: Evgeny L Date: Mon, 8 Jul 2019 21:25:29 +0000 Subject: [PATCH] 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 Change-Id: Id981e2650efc24a9e67cf87a0abd414a96f40088 --- .../schemas/pegleg/EndpointCatalogue/v1.yaml | 7 + .../osh/openstack-cinder/chart-group.yaml | 1 - .../charts/osh/openstack-cinder/cinder.yaml | 15 +- .../openstack-compute-kit/chart-group.yaml | 2 - .../neutron-rabbitmq.yaml | 120 --------------- .../osh/openstack-compute-kit/neutron.yaml | 15 +- .../openstack-compute-kit/nova-rabbitmq.yaml | 120 --------------- .../osh/openstack-compute-kit/nova.yaml | 15 +- .../osh/openstack-glance/chart-group.yaml | 1 - .../charts/osh/openstack-glance/glance.yaml | 15 +- .../charts/osh/openstack-glance/rabbitmq.yaml | 120 --------------- .../osh/openstack-heat/chart-group.yaml | 1 - .../charts/osh/openstack-heat/heat.yaml | 15 +- .../charts/osh/openstack-heat/rabbitmq.yaml | 120 --------------- .../osh/openstack-keystone/chart-group.yaml | 1 - .../osh/openstack-keystone/keystone.yaml | 33 ++-- .../osh/openstack-keystone/rabbitmq.yaml | 120 --------------- .../osh/openstack-rabbitmq/chart-group.yaml | 16 ++ .../rabbitmq.yaml | 36 ++--- global/software/manifests/full-site.yaml | 1 + .../osh_oslo_messaging_admin_password.yaml} | 2 +- .../osh_rabbitmq_erlang_cookie.yaml} | 2 +- .../osh/openstack-glance/chart-group.yaml | 1 - .../osh/openstack-heat/chart-group.yaml | 1 - site/aiab/software/full-site.yaml | 1 + ...arbican_oslo_messaging_admin_password.yaml | 11 -- .../osh_barbican_oslo_messaging_password.yaml | 11 -- .../osh_barbican_rabbitmq_erlang_cookie.yaml | 11 -- ..._cinder_oslo_messaging_admin_password.yaml | 11 -- .../osh_cinder_oslo_messaging_password.yaml | 11 -- ..._glance_oslo_messaging_admin_password.yaml | 11 -- .../osh_glance_oslo_messaging_password.yaml | 11 -- ...sh_heat_oslo_messaging_admin_password.yaml | 11 -- ...eystone_oslo_messaging_admin_password.yaml | 11 -- .../osh_keystone_oslo_messaging_password.yaml | 11 -- .../osh_keystone_rabbitmq_erlang_cookie.yaml | 11 -- ...neutron_oslo_messaging_admin_password.yaml | 11 -- .../osh_neutron_oslo_messaging_password.yaml | 11 -- .../osh_neutron_rabbitmq_erlang_cookie.yaml | 11 -- ...sh_nova_oslo_messaging_admin_password.yaml | 11 -- ....yaml => osh_oslo_messaging_password.yaml} | 2 +- ...e.yaml => osh_rabbitmq_erlang_cookie.yaml} | 2 +- .../openstack-compute-kit/chart-group.yaml | 2 - .../neutron-rabbitmq.yaml | 28 ---- .../openstack-compute-kit/nova-rabbitmq.yaml | 28 ---- .../osh/openstack-glance/chart-group.yaml | 1 - .../charts/osh/openstack-glance/rabbitmq.yaml | 28 ---- .../osh/openstack-heat/chart-group.yaml | 1 - .../osh/openstack-keystone/chart-group.yaml | 1 - .../osh/openstack-keystone/rabbitmq.yaml | 28 ---- .../osh/openstack-rabbitmq/chart-group.yaml | 21 +++ .../rabbitmq.yaml | 5 +- site/airskiff/software/config/endpoints.yaml | 143 +----------------- .../software/config/service_accounts.yaml | 17 +-- .../software/manifests/full-site.yaml | 1 + .../osh_oslo_messaging_admin_password.yaml | 11 ++ .../osh_rabbitmq_erlang_cookie.yaml} | 2 +- .../osh_oslo_messaging_admin_password.yaml | 11 ++ .../osh_rabbitmq_erlang_cookie.yaml} | 2 +- site/seaworthy/software/config/endpoints.yaml | 143 +----------------- .../software/config/service_accounts.yaml | 17 +-- .../charts/osh/comps/glance-rabbitmq.yaml | 23 --- .../sloop/charts/osh/comps/heat-rabbitmq.yaml | 23 --- .../charts/osh/comps/keystone-rabbitmq.yaml | 23 --- .../charts/osh/comps/neutron-rabbitmq.yaml | 23 --- .../sloop/charts/osh/comps/nova-rabbitmq.yaml | 23 --- ...-rabbitmq.yaml => openstack-rabbitmq.yaml} | 6 +- type/sloop/config/endpoints.yaml | 143 +----------------- type/sloop/config/service_accounts.yaml | 17 +-- type/sloop/manifests/full-site.yaml | 1 + 70 files changed, 209 insertions(+), 1513 deletions(-) delete mode 100644 global/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml delete mode 100644 global/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml delete mode 100644 global/software/charts/osh/openstack-glance/rabbitmq.yaml delete mode 100644 global/software/charts/osh/openstack-heat/rabbitmq.yaml delete mode 100644 global/software/charts/osh/openstack-keystone/rabbitmq.yaml create mode 100644 global/software/charts/osh/openstack-rabbitmq/chart-group.yaml rename global/software/charts/osh/{openstack-cinder => openstack-rabbitmq}/rabbitmq.yaml (77%) rename site/{airskiff/secrets/passphrases/osh_glance_rabbitmq_erlang_cookie.yaml => aiab/secrets/passphrases/osh_oslo_messaging_admin_password.yaml} (81%) rename site/{airskiff/secrets/passphrases/osh_heat_rabbitmq_erlang_cookie.yaml => aiab/secrets/passphrases/osh_rabbitmq_erlang_cookie.yaml} (82%) delete mode 100644 site/airskiff/secrets/passphrases/osh_barbican_oslo_messaging_admin_password.yaml delete mode 100644 site/airskiff/secrets/passphrases/osh_barbican_oslo_messaging_password.yaml delete mode 100644 site/airskiff/secrets/passphrases/osh_barbican_rabbitmq_erlang_cookie.yaml delete mode 100644 site/airskiff/secrets/passphrases/osh_cinder_oslo_messaging_admin_password.yaml delete mode 100644 site/airskiff/secrets/passphrases/osh_cinder_oslo_messaging_password.yaml delete mode 100644 site/airskiff/secrets/passphrases/osh_glance_oslo_messaging_admin_password.yaml delete mode 100644 site/airskiff/secrets/passphrases/osh_glance_oslo_messaging_password.yaml delete mode 100644 site/airskiff/secrets/passphrases/osh_heat_oslo_messaging_admin_password.yaml delete mode 100644 site/airskiff/secrets/passphrases/osh_keystone_oslo_messaging_admin_password.yaml delete mode 100644 site/airskiff/secrets/passphrases/osh_keystone_oslo_messaging_password.yaml delete mode 100644 site/airskiff/secrets/passphrases/osh_keystone_rabbitmq_erlang_cookie.yaml delete mode 100644 site/airskiff/secrets/passphrases/osh_neutron_oslo_messaging_admin_password.yaml delete mode 100644 site/airskiff/secrets/passphrases/osh_neutron_oslo_messaging_password.yaml delete mode 100644 site/airskiff/secrets/passphrases/osh_neutron_rabbitmq_erlang_cookie.yaml delete mode 100644 site/airskiff/secrets/passphrases/osh_nova_oslo_messaging_admin_password.yaml rename site/airskiff/secrets/passphrases/{osh_cinder_rabbitmq_erlang_cookie.yaml => osh_oslo_messaging_password.yaml} (81%) rename site/airskiff/secrets/passphrases/{osh_nova_rabbitmq_erlang_cookie.yaml => osh_rabbitmq_erlang_cookie.yaml} (82%) delete mode 100644 site/airskiff/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml delete mode 100644 site/airskiff/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml delete mode 100644 site/airskiff/software/charts/osh/openstack-glance/rabbitmq.yaml delete mode 100644 site/airskiff/software/charts/osh/openstack-keystone/rabbitmq.yaml create mode 100644 site/airskiff/software/charts/osh/openstack-rabbitmq/chart-group.yaml rename site/airskiff/software/charts/osh/{openstack-heat => openstack-rabbitmq}/rabbitmq.yaml (84%) create mode 100644 site/airsloop/secrets/passphrases/osh_oslo_messaging_admin_password.yaml rename site/{airskiff/secrets/passphrases/osh_heat_oslo_messaging_password.yaml => airsloop/secrets/passphrases/osh_rabbitmq_erlang_cookie.yaml} (81%) create mode 100644 site/seaworthy/secrets/passphrases/osh_oslo_messaging_admin_password.yaml rename site/{airskiff/secrets/passphrases/osh_nova_oslo_messaging_password.yaml => seaworthy/secrets/passphrases/osh_rabbitmq_erlang_cookie.yaml} (81%) delete mode 100644 type/sloop/charts/osh/comps/glance-rabbitmq.yaml delete mode 100644 type/sloop/charts/osh/comps/heat-rabbitmq.yaml delete mode 100644 type/sloop/charts/osh/comps/keystone-rabbitmq.yaml delete mode 100644 type/sloop/charts/osh/comps/neutron-rabbitmq.yaml delete mode 100644 type/sloop/charts/osh/comps/nova-rabbitmq.yaml rename type/sloop/charts/osh/comps/{cinder-rabbitmq.yaml => openstack-rabbitmq.yaml} (76%) diff --git a/global/schemas/pegleg/EndpointCatalogue/v1.yaml b/global/schemas/pegleg/EndpointCatalogue/v1.yaml index c48ba7bcb..309989012 100644 --- a/global/schemas/pegleg/EndpointCatalogue/v1.yaml +++ b/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: diff --git a/global/software/charts/osh/openstack-cinder/chart-group.yaml b/global/software/charts/osh/openstack-cinder/chart-group.yaml index dc25b480e..478061ff0 100644 --- a/global/software/charts/osh/openstack-cinder/chart-group.yaml +++ b/global/software/charts/osh/openstack-cinder/chart-group.yaml @@ -13,5 +13,4 @@ metadata: data: description: Deploy Cinder chart_group: - - cinder-rabbitmq - cinder diff --git a/global/software/charts/osh/openstack-cinder/cinder.yaml b/global/software/charts/osh/openstack-cinder/cinder.yaml index 4aab9ef8c..f47fa02cb 100644 --- a/global/software/charts/osh/openstack-cinder/cinder.yaml +++ b/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 diff --git a/global/software/charts/osh/openstack-compute-kit/chart-group.yaml b/global/software/charts/osh/openstack-compute-kit/chart-group.yaml index c861780e7..6fd239081 100644 --- a/global/software/charts/osh/openstack-compute-kit/chart-group.yaml +++ b/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 diff --git a/global/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml b/global/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml deleted file mode 100644 index 4e96a6065..000000000 --- a/global/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml +++ /dev/null @@ -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: [] -... diff --git a/global/software/charts/osh/openstack-compute-kit/neutron.yaml b/global/software/charts/osh/openstack-compute-kit/neutron.yaml index 8f1ff6f31..dc48584cd 100644 --- a/global/software/charts/osh/openstack-compute-kit/neutron.yaml +++ b/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 diff --git a/global/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml b/global/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml deleted file mode 100644 index 82328cd67..000000000 --- a/global/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml +++ /dev/null @@ -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: [] -... diff --git a/global/software/charts/osh/openstack-compute-kit/nova.yaml b/global/software/charts/osh/openstack-compute-kit/nova.yaml index 98d6b086e..900da7e1c 100644 --- a/global/software/charts/osh/openstack-compute-kit/nova.yaml +++ b/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 diff --git a/global/software/charts/osh/openstack-glance/chart-group.yaml b/global/software/charts/osh/openstack-glance/chart-group.yaml index 593dac409..115d55322 100644 --- a/global/software/charts/osh/openstack-glance/chart-group.yaml +++ b/global/software/charts/osh/openstack-glance/chart-group.yaml @@ -13,5 +13,4 @@ metadata: data: description: Deploy Glance chart_group: - - glance-rabbitmq - glance diff --git a/global/software/charts/osh/openstack-glance/glance.yaml b/global/software/charts/osh/openstack-glance/glance.yaml index 2e30fa266..59f3f1b36 100644 --- a/global/software/charts/osh/openstack-glance/glance.yaml +++ b/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 diff --git a/global/software/charts/osh/openstack-glance/rabbitmq.yaml b/global/software/charts/osh/openstack-glance/rabbitmq.yaml deleted file mode 100644 index 874937022..000000000 --- a/global/software/charts/osh/openstack-glance/rabbitmq.yaml +++ /dev/null @@ -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: [] -... diff --git a/global/software/charts/osh/openstack-heat/chart-group.yaml b/global/software/charts/osh/openstack-heat/chart-group.yaml index 02507afb1..94d8f7e32 100644 --- a/global/software/charts/osh/openstack-heat/chart-group.yaml +++ b/global/software/charts/osh/openstack-heat/chart-group.yaml @@ -13,5 +13,4 @@ metadata: data: description: Deploy Heat chart_group: - - heat-rabbitmq - heat diff --git a/global/software/charts/osh/openstack-heat/heat.yaml b/global/software/charts/osh/openstack-heat/heat.yaml index 2ce64baf7..4a8eecc62 100644 --- a/global/software/charts/osh/openstack-heat/heat.yaml +++ b/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 diff --git a/global/software/charts/osh/openstack-heat/rabbitmq.yaml b/global/software/charts/osh/openstack-heat/rabbitmq.yaml deleted file mode 100644 index 229f41e0e..000000000 --- a/global/software/charts/osh/openstack-heat/rabbitmq.yaml +++ /dev/null @@ -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: [] -... diff --git a/global/software/charts/osh/openstack-keystone/chart-group.yaml b/global/software/charts/osh/openstack-keystone/chart-group.yaml index bcc066e15..fb286780f 100644 --- a/global/software/charts/osh/openstack-keystone/chart-group.yaml +++ b/global/software/charts/osh/openstack-keystone/chart-group.yaml @@ -13,5 +13,4 @@ metadata: data: description: Deploy Keystone chart_group: - - keystone-rabbitmq - keystone diff --git a/global/software/charts/osh/openstack-keystone/keystone.yaml b/global/software/charts/osh/openstack-keystone/keystone.yaml index d5f12faad..4884f50df 100644 --- a/global/software/charts/osh/openstack-keystone/keystone.yaml +++ b/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 ... diff --git a/global/software/charts/osh/openstack-keystone/rabbitmq.yaml b/global/software/charts/osh/openstack-keystone/rabbitmq.yaml deleted file mode 100644 index 9af10b1db..000000000 --- a/global/software/charts/osh/openstack-keystone/rabbitmq.yaml +++ /dev/null @@ -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: [] -... diff --git a/global/software/charts/osh/openstack-rabbitmq/chart-group.yaml b/global/software/charts/osh/openstack-rabbitmq/chart-group.yaml new file mode 100644 index 000000000..b31286578 --- /dev/null +++ b/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 diff --git a/global/software/charts/osh/openstack-cinder/rabbitmq.yaml b/global/software/charts/osh/openstack-rabbitmq/rabbitmq.yaml similarity index 77% rename from global/software/charts/osh/openstack-cinder/rabbitmq.yaml rename to global/software/charts/osh/openstack-rabbitmq/rabbitmq.yaml index e720b2c53..8e1c94264 100644 --- a/global/software/charts/osh/openstack-cinder/rabbitmq.yaml +++ b/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 - component: cinder + name: openstack-rabbitmq-global 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 - release: cinder-rabbitmq + chart_name: openstack-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 - release: cinder-rabbitmq-htk - namespace: cinder-rabbitmq-htk + chart_name: openstack-rabbitmq-htk + release: openstack-rabbitmq-htk + namespace: openstack-rabbitmq-htk values: {} dependencies: [] ... diff --git a/global/software/manifests/full-site.yaml b/global/software/manifests/full-site.yaml index 1d4730f8b..bc64638b8 100644 --- a/global/software/manifests/full-site.yaml +++ b/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 diff --git a/site/airskiff/secrets/passphrases/osh_glance_rabbitmq_erlang_cookie.yaml b/site/aiab/secrets/passphrases/osh_oslo_messaging_admin_password.yaml similarity index 81% rename from site/airskiff/secrets/passphrases/osh_glance_rabbitmq_erlang_cookie.yaml rename to site/aiab/secrets/passphrases/osh_oslo_messaging_admin_password.yaml index 496fae3f6..e7d97e27c 100644 --- a/site/airskiff/secrets/passphrases/osh_glance_rabbitmq_erlang_cookie.yaml +++ b/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 diff --git a/site/airskiff/secrets/passphrases/osh_heat_rabbitmq_erlang_cookie.yaml b/site/aiab/secrets/passphrases/osh_rabbitmq_erlang_cookie.yaml similarity index 82% rename from site/airskiff/secrets/passphrases/osh_heat_rabbitmq_erlang_cookie.yaml rename to site/aiab/secrets/passphrases/osh_rabbitmq_erlang_cookie.yaml index 74e2a9906..a3b5a2b69 100644 --- a/site/airskiff/secrets/passphrases/osh_heat_rabbitmq_erlang_cookie.yaml +++ b/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 diff --git a/site/aiab/software/charts/osh/openstack-glance/chart-group.yaml b/site/aiab/software/charts/osh/openstack-glance/chart-group.yaml index 1c3e05c81..987bcd54b 100644 --- a/site/aiab/software/charts/osh/openstack-glance/chart-group.yaml +++ b/site/aiab/software/charts/osh/openstack-glance/chart-group.yaml @@ -15,5 +15,4 @@ metadata: storagePolicy: cleartext data: chart_group: - - glance-rabbitmq - glance-aiab diff --git a/site/aiab/software/charts/osh/openstack-heat/chart-group.yaml b/site/aiab/software/charts/osh/openstack-heat/chart-group.yaml index 186e5f1ee..0317b8724 100644 --- a/site/aiab/software/charts/osh/openstack-heat/chart-group.yaml +++ b/site/aiab/software/charts/osh/openstack-heat/chart-group.yaml @@ -16,5 +16,4 @@ metadata: data: sequenced: true chart_group: - - heat-rabbitmq - heat-aiab diff --git a/site/aiab/software/full-site.yaml b/site/aiab/software/full-site.yaml index dac74557a..0a6df5e0d 100644 --- a/site/aiab/software/full-site.yaml +++ b/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 diff --git a/site/airskiff/secrets/passphrases/osh_barbican_oslo_messaging_admin_password.yaml b/site/airskiff/secrets/passphrases/osh_barbican_oslo_messaging_admin_password.yaml deleted file mode 100644 index bb19957a1..000000000 --- a/site/airskiff/secrets/passphrases/osh_barbican_oslo_messaging_admin_password.yaml +++ /dev/null @@ -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 -... diff --git a/site/airskiff/secrets/passphrases/osh_barbican_oslo_messaging_password.yaml b/site/airskiff/secrets/passphrases/osh_barbican_oslo_messaging_password.yaml deleted file mode 100644 index 9bf0217bf..000000000 --- a/site/airskiff/secrets/passphrases/osh_barbican_oslo_messaging_password.yaml +++ /dev/null @@ -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 -... diff --git a/site/airskiff/secrets/passphrases/osh_barbican_rabbitmq_erlang_cookie.yaml b/site/airskiff/secrets/passphrases/osh_barbican_rabbitmq_erlang_cookie.yaml deleted file mode 100644 index 32f8dae0f..000000000 --- a/site/airskiff/secrets/passphrases/osh_barbican_rabbitmq_erlang_cookie.yaml +++ /dev/null @@ -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 -... diff --git a/site/airskiff/secrets/passphrases/osh_cinder_oslo_messaging_admin_password.yaml b/site/airskiff/secrets/passphrases/osh_cinder_oslo_messaging_admin_password.yaml deleted file mode 100644 index 040e65769..000000000 --- a/site/airskiff/secrets/passphrases/osh_cinder_oslo_messaging_admin_password.yaml +++ /dev/null @@ -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 -... diff --git a/site/airskiff/secrets/passphrases/osh_cinder_oslo_messaging_password.yaml b/site/airskiff/secrets/passphrases/osh_cinder_oslo_messaging_password.yaml deleted file mode 100644 index 5d76ba793..000000000 --- a/site/airskiff/secrets/passphrases/osh_cinder_oslo_messaging_password.yaml +++ /dev/null @@ -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 -... diff --git a/site/airskiff/secrets/passphrases/osh_glance_oslo_messaging_admin_password.yaml b/site/airskiff/secrets/passphrases/osh_glance_oslo_messaging_admin_password.yaml deleted file mode 100644 index 57db7521f..000000000 --- a/site/airskiff/secrets/passphrases/osh_glance_oslo_messaging_admin_password.yaml +++ /dev/null @@ -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 -... diff --git a/site/airskiff/secrets/passphrases/osh_glance_oslo_messaging_password.yaml b/site/airskiff/secrets/passphrases/osh_glance_oslo_messaging_password.yaml deleted file mode 100644 index d103c2780..000000000 --- a/site/airskiff/secrets/passphrases/osh_glance_oslo_messaging_password.yaml +++ /dev/null @@ -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 -... diff --git a/site/airskiff/secrets/passphrases/osh_heat_oslo_messaging_admin_password.yaml b/site/airskiff/secrets/passphrases/osh_heat_oslo_messaging_admin_password.yaml deleted file mode 100644 index 074e688f5..000000000 --- a/site/airskiff/secrets/passphrases/osh_heat_oslo_messaging_admin_password.yaml +++ /dev/null @@ -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 -... diff --git a/site/airskiff/secrets/passphrases/osh_keystone_oslo_messaging_admin_password.yaml b/site/airskiff/secrets/passphrases/osh_keystone_oslo_messaging_admin_password.yaml deleted file mode 100644 index aec85c07c..000000000 --- a/site/airskiff/secrets/passphrases/osh_keystone_oslo_messaging_admin_password.yaml +++ /dev/null @@ -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 -... diff --git a/site/airskiff/secrets/passphrases/osh_keystone_oslo_messaging_password.yaml b/site/airskiff/secrets/passphrases/osh_keystone_oslo_messaging_password.yaml deleted file mode 100644 index be716f432..000000000 --- a/site/airskiff/secrets/passphrases/osh_keystone_oslo_messaging_password.yaml +++ /dev/null @@ -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 -... diff --git a/site/airskiff/secrets/passphrases/osh_keystone_rabbitmq_erlang_cookie.yaml b/site/airskiff/secrets/passphrases/osh_keystone_rabbitmq_erlang_cookie.yaml deleted file mode 100644 index ee7e4bd25..000000000 --- a/site/airskiff/secrets/passphrases/osh_keystone_rabbitmq_erlang_cookie.yaml +++ /dev/null @@ -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 -... diff --git a/site/airskiff/secrets/passphrases/osh_neutron_oslo_messaging_admin_password.yaml b/site/airskiff/secrets/passphrases/osh_neutron_oslo_messaging_admin_password.yaml deleted file mode 100644 index 4ac42c9b0..000000000 --- a/site/airskiff/secrets/passphrases/osh_neutron_oslo_messaging_admin_password.yaml +++ /dev/null @@ -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 -... diff --git a/site/airskiff/secrets/passphrases/osh_neutron_oslo_messaging_password.yaml b/site/airskiff/secrets/passphrases/osh_neutron_oslo_messaging_password.yaml deleted file mode 100644 index 6be02b9ce..000000000 --- a/site/airskiff/secrets/passphrases/osh_neutron_oslo_messaging_password.yaml +++ /dev/null @@ -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 -... diff --git a/site/airskiff/secrets/passphrases/osh_neutron_rabbitmq_erlang_cookie.yaml b/site/airskiff/secrets/passphrases/osh_neutron_rabbitmq_erlang_cookie.yaml deleted file mode 100644 index 9e8ff8deb..000000000 --- a/site/airskiff/secrets/passphrases/osh_neutron_rabbitmq_erlang_cookie.yaml +++ /dev/null @@ -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 -... diff --git a/site/airskiff/secrets/passphrases/osh_nova_oslo_messaging_admin_password.yaml b/site/airskiff/secrets/passphrases/osh_nova_oslo_messaging_admin_password.yaml deleted file mode 100644 index 487bcc57f..000000000 --- a/site/airskiff/secrets/passphrases/osh_nova_oslo_messaging_admin_password.yaml +++ /dev/null @@ -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 -... diff --git a/site/airskiff/secrets/passphrases/osh_cinder_rabbitmq_erlang_cookie.yaml b/site/airskiff/secrets/passphrases/osh_oslo_messaging_password.yaml similarity index 81% rename from site/airskiff/secrets/passphrases/osh_cinder_rabbitmq_erlang_cookie.yaml rename to site/airskiff/secrets/passphrases/osh_oslo_messaging_password.yaml index b1ac8ffdc..e7d97e27c 100644 --- a/site/airskiff/secrets/passphrases/osh_cinder_rabbitmq_erlang_cookie.yaml +++ b/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 diff --git a/site/airskiff/secrets/passphrases/osh_nova_rabbitmq_erlang_cookie.yaml b/site/airskiff/secrets/passphrases/osh_rabbitmq_erlang_cookie.yaml similarity index 82% rename from site/airskiff/secrets/passphrases/osh_nova_rabbitmq_erlang_cookie.yaml rename to site/airskiff/secrets/passphrases/osh_rabbitmq_erlang_cookie.yaml index 7a885e683..a3b5a2b69 100644 --- a/site/airskiff/secrets/passphrases/osh_nova_rabbitmq_erlang_cookie.yaml +++ b/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 diff --git a/site/airskiff/software/charts/osh/openstack-compute-kit/chart-group.yaml b/site/airskiff/software/charts/osh/openstack-compute-kit/chart-group.yaml index f2dbebc78..72eed553a 100644 --- a/site/airskiff/software/charts/osh/openstack-compute-kit/chart-group.yaml +++ b/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 diff --git a/site/airskiff/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml b/site/airskiff/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml deleted file mode 100644 index be0493f7b..000000000 --- a/site/airskiff/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml +++ /dev/null @@ -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 -... diff --git a/site/airskiff/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml b/site/airskiff/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml deleted file mode 100644 index ad1f7daae..000000000 --- a/site/airskiff/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml +++ /dev/null @@ -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 -... diff --git a/site/airskiff/software/charts/osh/openstack-glance/chart-group.yaml b/site/airskiff/software/charts/osh/openstack-glance/chart-group.yaml index ba2cfbe7a..0f0eec4bf 100644 --- a/site/airskiff/software/charts/osh/openstack-glance/chart-group.yaml +++ b/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 diff --git a/site/airskiff/software/charts/osh/openstack-glance/rabbitmq.yaml b/site/airskiff/software/charts/osh/openstack-glance/rabbitmq.yaml deleted file mode 100644 index 978cdf99c..000000000 --- a/site/airskiff/software/charts/osh/openstack-glance/rabbitmq.yaml +++ /dev/null @@ -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 -... diff --git a/site/airskiff/software/charts/osh/openstack-heat/chart-group.yaml b/site/airskiff/software/charts/osh/openstack-heat/chart-group.yaml index 49e24c3e9..52dd4bc7e 100644 --- a/site/airskiff/software/charts/osh/openstack-heat/chart-group.yaml +++ b/site/airskiff/software/charts/osh/openstack-heat/chart-group.yaml @@ -18,5 +18,4 @@ metadata: data: sequenced: true chart_group: - - heat-rabbitmq-airskiff - heat diff --git a/site/airskiff/software/charts/osh/openstack-keystone/chart-group.yaml b/site/airskiff/software/charts/osh/openstack-keystone/chart-group.yaml index b0e5924ec..d730cf99b 100644 --- a/site/airskiff/software/charts/osh/openstack-keystone/chart-group.yaml +++ b/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 diff --git a/site/airskiff/software/charts/osh/openstack-keystone/rabbitmq.yaml b/site/airskiff/software/charts/osh/openstack-keystone/rabbitmq.yaml deleted file mode 100644 index e5ebc2789..000000000 --- a/site/airskiff/software/charts/osh/openstack-keystone/rabbitmq.yaml +++ /dev/null @@ -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 -... diff --git a/site/airskiff/software/charts/osh/openstack-rabbitmq/chart-group.yaml b/site/airskiff/software/charts/osh/openstack-rabbitmq/chart-group.yaml new file mode 100644 index 000000000..b800bd099 --- /dev/null +++ b/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 diff --git a/site/airskiff/software/charts/osh/openstack-heat/rabbitmq.yaml b/site/airskiff/software/charts/osh/openstack-rabbitmq/rabbitmq.yaml similarity index 84% rename from site/airskiff/software/charts/osh/openstack-heat/rabbitmq.yaml rename to site/airskiff/software/charts/osh/openstack-rabbitmq/rabbitmq.yaml index 1e219ab8f..b47b61302 100644 --- a/site/airskiff/software/charts/osh/openstack-heat/rabbitmq.yaml +++ b/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 - component: heat + name: openstack-rabbitmq-global actions: - method: delete path: .values.labels.prometheus_rabbitmq_exporter diff --git a/site/airskiff/software/config/endpoints.yaml b/site/airskiff/software/config/endpoints.yaml index a360ab725..addf900a0 100644 --- a/site/airskiff/software/config/endpoints.yaml +++ b/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: diff --git a/site/airskiff/software/config/service_accounts.yaml b/site/airskiff/software/config/service_accounts.yaml index 5a0d40722..f15b49218 100644 --- a/site/airskiff/software/config/service_accounts.yaml +++ b/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 diff --git a/site/airskiff/software/manifests/full-site.yaml b/site/airskiff/software/manifests/full-site.yaml index 27e739638..51ffa42bd 100644 --- a/site/airskiff/software/manifests/full-site.yaml +++ b/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 diff --git a/site/airsloop/secrets/passphrases/osh_oslo_messaging_admin_password.yaml b/site/airsloop/secrets/passphrases/osh_oslo_messaging_admin_password.yaml new file mode 100644 index 000000000..e7d97e27c --- /dev/null +++ b/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 +... diff --git a/site/airskiff/secrets/passphrases/osh_heat_oslo_messaging_password.yaml b/site/airsloop/secrets/passphrases/osh_rabbitmq_erlang_cookie.yaml similarity index 81% rename from site/airskiff/secrets/passphrases/osh_heat_oslo_messaging_password.yaml rename to site/airsloop/secrets/passphrases/osh_rabbitmq_erlang_cookie.yaml index 39f132713..a3b5a2b69 100644 --- a/site/airskiff/secrets/passphrases/osh_heat_oslo_messaging_password.yaml +++ b/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 diff --git a/site/seaworthy/secrets/passphrases/osh_oslo_messaging_admin_password.yaml b/site/seaworthy/secrets/passphrases/osh_oslo_messaging_admin_password.yaml new file mode 100644 index 000000000..e7d97e27c --- /dev/null +++ b/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 +... diff --git a/site/airskiff/secrets/passphrases/osh_nova_oslo_messaging_password.yaml b/site/seaworthy/secrets/passphrases/osh_rabbitmq_erlang_cookie.yaml similarity index 81% rename from site/airskiff/secrets/passphrases/osh_nova_oslo_messaging_password.yaml rename to site/seaworthy/secrets/passphrases/osh_rabbitmq_erlang_cookie.yaml index 13569ba02..a3b5a2b69 100644 --- a/site/airskiff/secrets/passphrases/osh_nova_oslo_messaging_password.yaml +++ b/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 diff --git a/site/seaworthy/software/config/endpoints.yaml b/site/seaworthy/software/config/endpoints.yaml index 7d4ad0c67..07f966339 100644 --- a/site/seaworthy/software/config/endpoints.yaml +++ b/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: diff --git a/site/seaworthy/software/config/service_accounts.yaml b/site/seaworthy/software/config/service_accounts.yaml index 5a0d40722..f15b49218 100644 --- a/site/seaworthy/software/config/service_accounts.yaml +++ b/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 diff --git a/type/sloop/charts/osh/comps/glance-rabbitmq.yaml b/type/sloop/charts/osh/comps/glance-rabbitmq.yaml deleted file mode 100644 index 54f9db166..000000000 --- a/type/sloop/charts/osh/comps/glance-rabbitmq.yaml +++ /dev/null @@ -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 -... diff --git a/type/sloop/charts/osh/comps/heat-rabbitmq.yaml b/type/sloop/charts/osh/comps/heat-rabbitmq.yaml deleted file mode 100644 index 04c8196f1..000000000 --- a/type/sloop/charts/osh/comps/heat-rabbitmq.yaml +++ /dev/null @@ -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 -... diff --git a/type/sloop/charts/osh/comps/keystone-rabbitmq.yaml b/type/sloop/charts/osh/comps/keystone-rabbitmq.yaml deleted file mode 100644 index 21c3e59cf..000000000 --- a/type/sloop/charts/osh/comps/keystone-rabbitmq.yaml +++ /dev/null @@ -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 -... diff --git a/type/sloop/charts/osh/comps/neutron-rabbitmq.yaml b/type/sloop/charts/osh/comps/neutron-rabbitmq.yaml deleted file mode 100644 index 977c2b1c5..000000000 --- a/type/sloop/charts/osh/comps/neutron-rabbitmq.yaml +++ /dev/null @@ -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 -... diff --git a/type/sloop/charts/osh/comps/nova-rabbitmq.yaml b/type/sloop/charts/osh/comps/nova-rabbitmq.yaml deleted file mode 100644 index fdebe0941..000000000 --- a/type/sloop/charts/osh/comps/nova-rabbitmq.yaml +++ /dev/null @@ -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 -... diff --git a/type/sloop/charts/osh/comps/cinder-rabbitmq.yaml b/type/sloop/charts/osh/comps/openstack-rabbitmq.yaml similarity index 76% rename from type/sloop/charts/osh/comps/cinder-rabbitmq.yaml rename to type/sloop/charts/osh/comps/openstack-rabbitmq.yaml index 2fddc2fc4..75d389892 100644 --- a/type/sloop/charts/osh/comps/cinder-rabbitmq.yaml +++ b/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: . diff --git a/type/sloop/config/endpoints.yaml b/type/sloop/config/endpoints.yaml index 73c0a4a16..f5218ffc0 100644 --- a/type/sloop/config/endpoints.yaml +++ b/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: diff --git a/type/sloop/config/service_accounts.yaml b/type/sloop/config/service_accounts.yaml index 7758da39d..c9b76e76f 100644 --- a/type/sloop/config/service_accounts.yaml +++ b/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 diff --git a/type/sloop/manifests/full-site.yaml b/type/sloop/manifests/full-site.yaml index 29cffc21e..070ef8c84 100644 --- a/type/sloop/manifests/full-site.yaml +++ b/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