From dc1ef4c138516cf517911227e73b15f3d490ed3d Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <wilkers.steve@gmail.com>
Date: Sat, 2 Feb 2019 16:43:14 -0600
Subject: [PATCH] Update openstack-helm Armada job

This updates the openstack-helm Armada job to instead deploy
only Ceph, the OpenStack service charts, and their dependencies.
This is dependent on the addition of the Armada job for Ceph and
the LMA components to openstack-helm-infra. This also updates the
jobs definition to use the osh-gate-runner playbook instead, as
well as sets the job both to a periodic and experimental job

Depends-On: https://review.openstack.org/#/c/634676/
Depends-On: https://review.openstack.org/#/c/633067/
Change-Id: I7e191a153f123e04e123acc33fb691d8117062a9
---
 .../armada/020-armada-render-manifests.sh     |   11 +-
 .../armada/025-armada-validate-manifests.sh   |    2 +-
 .../armada/030-armada-apply-manifests.sh      |    2 +-
 ...passwords.sh => generate-osh-passwords.sh} |   14 +-
 .../armada/manifests/armada-ceph.yaml         |  327 ----
 .../manifests/armada-cluster-ingress.yaml     |   81 -
 .../armada/manifests/armada-lma.yaml          | 1340 -----------------
 .../armada/manifests/armada-osh.yaml          |   20 +-
 .../playbooks/armada-fullstack-deploy.yaml    |   74 -
 .../playbooks/gather-armada-manifests.yaml    |    1 -
 zuul.d/jobs-openstack-helm.yaml               |   16 +-
 zuul.d/project.yaml                           |    3 +-
 12 files changed, 35 insertions(+), 1856 deletions(-)
 rename tools/deployment/armada/{generate-passwords.sh => generate-osh-passwords.sh} (79%)
 delete mode 100644 tools/deployment/armada/manifests/armada-ceph.yaml
 delete mode 100644 tools/deployment/armada/manifests/armada-cluster-ingress.yaml
 delete mode 100644 tools/deployment/armada/manifests/armada-lma.yaml
 delete mode 100644 tools/gate/playbooks/armada-fullstack-deploy.yaml

diff --git a/tools/deployment/armada/020-armada-render-manifests.sh b/tools/deployment/armada/020-armada-render-manifests.sh
index b1f4f359d0..d8fdb9f7d4 100755
--- a/tools/deployment/armada/020-armada-render-manifests.sh
+++ b/tools/deployment/armada/020-armada-render-manifests.sh
@@ -16,10 +16,11 @@
 
 set -xe
 
-source ./tools/deployment/armada/generate-passwords.sh
 : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
 : ${OSH_PATH:="./"}
 
+source ./tools/deployment/armada/generate-osh-passwords.sh
+
 [ -s /tmp/ceph-fs-uuid.txt ] || uuidgen > /tmp/ceph-fs-uuid.txt
 #NOTE(portdirect): to use RBD devices with Ubuntu kernels < 4.5 this
 # should be set to 'hammer'
@@ -42,8 +43,10 @@ export OSH_PATH
 # fluentd's configuration. This ensures the placeholder value gets rendered appropriately
 export tag='${tag}'
 
-manifests="armada-cluster-ingress armada-ceph armada-lma armada-osh"
-for manifest in $manifests; do
+for manifest in armada-cluster-ingress armada-ceph; do
   echo "Rendering $manifest manifest"
-  envsubst < ./tools/deployment/armada/manifests/$manifest.yaml > /tmp/$manifest.yaml
+  envsubst < ${OSH_INFRA_PATH}/tools/deployment/armada/manifests/$manifest.yaml > /tmp/$manifest.yaml
 done
+
+echo "Rendering armada-osh manifest"
+envsubst < ./tools/deployment/armada/manifests/armada-osh.yaml > /tmp/armada-osh.yaml
diff --git a/tools/deployment/armada/025-armada-validate-manifests.sh b/tools/deployment/armada/025-armada-validate-manifests.sh
index e37ea52b17..e05230dd6f 100755
--- a/tools/deployment/armada/025-armada-validate-manifests.sh
+++ b/tools/deployment/armada/025-armada-validate-manifests.sh
@@ -16,7 +16,7 @@
 
 set -xe
 
-manifests="armada-cluster-ingress armada-ceph armada-lma armada-osh"
+manifests="armada-cluster-ingress armada-ceph armada-osh"
 for manifest in $manifests; do
   echo "Validating $manifest manifest"
   armada validate /tmp/$manifest.yaml
diff --git a/tools/deployment/armada/030-armada-apply-manifests.sh b/tools/deployment/armada/030-armada-apply-manifests.sh
index 02725509d1..b82489663e 100755
--- a/tools/deployment/armada/030-armada-apply-manifests.sh
+++ b/tools/deployment/armada/030-armada-apply-manifests.sh
@@ -16,7 +16,7 @@
 
 set -xe
 
-manifests="armada-cluster-ingress armada-ceph armada-lma armada-osh"
+manifests="armada-cluster-ingress armada-ceph armada-osh"
 for manifest in $manifests; do
   echo "Applying $manifest manifest"
   armada apply /tmp/$manifest.yaml
diff --git a/tools/deployment/armada/generate-passwords.sh b/tools/deployment/armada/generate-osh-passwords.sh
similarity index 79%
rename from tools/deployment/armada/generate-passwords.sh
rename to tools/deployment/armada/generate-osh-passwords.sh
index b6bc32a2ef..73ee217073 100755
--- a/tools/deployment/armada/generate-passwords.sh
+++ b/tools/deployment/armada/generate-osh-passwords.sh
@@ -22,14 +22,9 @@ passwords="BARBICAN_DB_PASSWORD \
     CINDER_DB_PASSWORD \
     CINDER_RABBITMQ_USER_PASSWORD \
     CINDER_USER_PASSWORD \
-    DB_ADMIN_PASSWORD \
-    ELASTICSEARCH_ADMIN_PASSWORD \
     GLANCE_DB_PASSWORD \
     GLANCE_RABBITMQ_USER_PASSWORD \
     GLANCE_USER_PASSWORD \
-    GRAFANA_ADMIN_PASSWORD \
-    GRAFANA_DB_PASSWORD \
-    GRAFANA_SESSION_DB_PASSWORD \
     HEAT_DB_PASSWORD \
     HEAT_RABBITMQ_USER_PASSWORD \
     HEAT_STACK_PASSWORD \
@@ -39,7 +34,6 @@ passwords="BARBICAN_DB_PASSWORD \
     KEYSTONE_AUTHTOKEN_MEMCACHED_SECRET_KEY \
     KEYSTONE_DB_PASSWORD \
     KEYSTONE_RABBITMQ_USER_PASSWORD \
-    KIBANA_ADMIN_PASSWORD \
     NEUTRON_DB_PASSWORD \
     NEUTRON_RABBITMQ_USER_PASSWORD \
     NEUTRON_USER_PASSWORD \
@@ -48,17 +42,13 @@ passwords="BARBICAN_DB_PASSWORD \
     NOVA_RABBITMQ_USER_PASSWORD \
     NOVA_USER_PASSWORD \
     OPENSTACK_EXPORTER_USER_PASSWORD \
-    PROMETHEUS_ADMIN_PASSWORD \
+    OSH_MARIADB_ADMIN_PASSWORD \
     RABBITMQ_ADMIN_PASSWORD \
-    RADOSGW_S3_ADMIN_ACCESS_KEY \
-    RADOSGW_S3_ADMIN_SECRET_KEY \
-    RADOSGW_S3_ELASTICSEARCH_ACCESS_KEY \
-    RADOSGW_S3_ELASTICSEARCH_SECRET_KEY \
     SWIFT_USER_PASSWORD"
 
 for password in $passwords
 do
   value=$(tr -dc A-Za-z0-9 < /dev/urandom 2>/dev/null | head -c 20)
   export $password=$value
-  echo "export $password=$value" >> /tmp/passwords.env
+  echo "export $password=$value" >> /tmp/osh-passwords.env
 done
diff --git a/tools/deployment/armada/manifests/armada-ceph.yaml b/tools/deployment/armada/manifests/armada-ceph.yaml
deleted file mode 100644
index 34747aed49..0000000000
--- a/tools/deployment/armada/manifests/armada-ceph.yaml
+++ /dev/null
@@ -1,327 +0,0 @@
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: helm-toolkit
-data:
-  chart_name: helm-toolkit
-  release: helm-toolkit
-  namespace: helm-toolkit
-  values: {}
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: helm-toolkit
-    reference: master
-  dependencies: []
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: ceph-ingress-controller
-data:
-  chart_name: ceph-ingress-controller
-  release: ceph-ingress-controller
-  namespace: ceph
-  wait:
-    timeout: 1800
-    labels:
-      release_group: osh-ceph-ingress-controller
-  install:
-    no_hooks: False
-  upgrade:
-    no_hooks: False
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: osh-ceph-ingress-controller
-  values:
-    release_uuid: ${RELEASE_UUID}
-    labels:
-      server:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-      error_server:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-    pod:
-      replicas:
-        error_page: 2
-        ingress: 2
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: ingress
-    reference: master
-  dependencies:
-    - helm-toolkit
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: ceph-mon
-data:
-  chart_name: ceph-mon
-  release: ceph-mon
-  namespace: ceph
-  wait:
-    timeout: 1800
-    labels:
-      release_group: osh-ceph-mon
-  install:
-    no_hooks: False
-  upgrade:
-    no_hooks: False
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: osh-ceph-mon
-  values:
-    release_uuid: ${RELEASE_UUID}
-    endpoints:
-      ceph_mon:
-        namespace: ceph
-    network:
-      public: ${CEPH_NETWORK}
-      cluster: ${CEPH_NETWORK}
-    deployment:
-      storage_secrets: true
-      ceph: true
-    bootstrap:
-      enabled: true
-    conf:
-      ceph:
-        global:
-          fsid: ${CEPH_FS_ID}
-      pool:
-        crush:
-          tunables: ${CRUSH_TUNABLES}
-        target:
-          # NOTE(portdirect): 5 nodes, with one osd per node
-          osd: 5
-          pg_per_osd: 100
-      storage:
-        osd:
-          - data:
-              type: directory
-              location: /var/lib/openstack-helm/ceph/osd/osd-one
-            journal:
-              type: directory
-              location: /var/lib/openstack-helm/ceph/osd/journal-one
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: ceph-mon
-    reference: master
-  dependencies:
-    - helm-toolkit
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: ceph-osd
-data:
-  chart_name: ceph-osd
-  release: ceph-osd
-  namespace: ceph
-  wait:
-    timeout: 1800
-    labels:
-      release_group: osh-ceph-osd
-  install:
-    no_hooks: False
-  upgrade:
-    no_hooks: False
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: osh-ceph-osd
-  values:
-    release_uuid: ${RELEASE_UUID}
-    endpoints:
-      ceph_mon:
-        namespace: ceph
-    network:
-      public: ${CEPH_NETWORK}
-      cluster: ${CEPH_NETWORK}
-    deployment:
-      ceph: true
-    bootstrap:
-      enabled: true
-    conf:
-      ceph:
-        global:
-          fsid: ${CEPH_FS_ID}
-      rgw_ks:
-        enabled: true
-      pool:
-        crush:
-          tunables: ${CRUSH_TUNABLES}
-        target:
-          # NOTE(portdirect): 5 nodes, with one osd per node
-          osd: 5
-          pg_per_osd: 100
-      storage:
-        osd:
-          - data:
-              type: directory
-              location: /var/lib/openstack-helm/ceph/osd/osd-one
-            journal:
-              type: directory
-              location: /var/lib/openstack-helm/ceph/osd/journal-one
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: ceph-osd
-    reference: master
-  dependencies:
-    - helm-toolkit
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: ceph-client
-data:
-  chart_name: ceph-client
-  release: ceph-client
-  namespace: ceph
-  wait:
-    timeout: 1800
-    labels:
-      release_group: osh-ceph-client
-  install:
-    no_hooks: False
-  upgrade:
-    no_hooks: False
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: osh-ceph-client
-  values:
-    release_uuid: ${RELEASE_UUID}
-    endpoints:
-      ceph_mon:
-        namespace: ceph
-    network:
-      public: ${CEPH_NETWORK}
-      cluster: ${CEPH_NETWORK}
-    deployment:
-      ceph: true
-    bootstrap:
-      enabled: true
-    conf:
-      ceph:
-        global:
-          fsid: ${CEPH_FS_ID}
-      pool:
-        crush:
-          tunables: ${CRUSH_TUNABLES}
-        target:
-          # NOTE(portdirect): 5 nodes, with one osd per node
-          osd: 5
-          pg_per_osd: 100
-      storage:
-        osd:
-          - data:
-              type: directory
-              location: /var/lib/openstack-helm/ceph/osd/osd-one
-            journal:
-              type: directory
-              location: /var/lib/openstack-helm/ceph/osd/journal-one
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: ceph-client
-    reference: master
-  dependencies:
-    - helm-toolkit
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: ceph-provisioners
-data:
-  chart_name: ceph-provisioners
-  release: ceph-provisioners
-  namespace: ceph
-  wait:
-    timeout: 1800
-    labels:
-      release_group: osh-ceph-provisioners
-  install:
-    no_hooks: False
-  upgrade:
-    no_hooks: False
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: osh-ceph-provisioners
-  values:
-    release_uuid: ${RELEASE_UUID}
-    endpoints:
-      ceph_mon:
-        namespace: ceph
-    network:
-      public: ${CEPH_NETWORK}
-      cluster: ${CEPH_NETWORK}
-    deployment:
-      ceph: true
-      rbd_provisioner: true
-      cephfs_provisioner: true
-      client_secrets: false
-    bootstrap:
-      enabled: true
-    conf:
-      ceph:
-        global:
-          fsid: ${CEPH_FS_ID}
-      pool:
-        crush:
-          tunables: ${CRUSH_TUNABLES}
-        target:
-          # NOTE(portdirect): 5 nodes, with one osd per node
-          osd: 5
-          pg_per_osd: 100
-      storage:
-        osd:
-          - data:
-              type: directory
-              location: /var/lib/openstack-helm/ceph/osd/osd-one
-            journal:
-              type: directory
-              location: /var/lib/openstack-helm/ceph/osd/journal-one
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: ceph-provisioners
-    reference: master
-  dependencies:
-    - helm-toolkit
----
-schema: armada/ChartGroup/v1
-metadata:
-  schema: metadata/Document/v1
-  name: ceph-storage
-data:
-  description: "Ceph Storage"
-  sequenced: True
-  chart_group:
-    - ceph-ingress-controller
-    - ceph-mon
-    - ceph-osd
-    - ceph-client
-    - ceph-provisioners
----
-schema: armada/Manifest/v1
-metadata:
-  schema: metadata/Document/v1
-  name: armada-manifest
-data:
-  release_prefix: osh
-  chart_groups:
-    - ceph-storage
diff --git a/tools/deployment/armada/manifests/armada-cluster-ingress.yaml b/tools/deployment/armada/manifests/armada-cluster-ingress.yaml
deleted file mode 100644
index 5a3ceb8017..0000000000
--- a/tools/deployment/armada/manifests/armada-cluster-ingress.yaml
+++ /dev/null
@@ -1,81 +0,0 @@
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: helm-toolkit
-data:
-  chart_name: helm-toolkit
-  release: helm-toolkit
-  namespace: helm-toolkit
-  values: {}
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: helm-toolkit
-    reference: master
-  dependencies: []
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: ingress-kube-system
-data:
-  chart_name: ingress-kube-system
-  release: ingress-kube-system
-  namespace: kube-system
-  wait:
-    timeout: 1800
-    labels:
-      release_group: osh-ingress-kube-system
-  install:
-    no_hooks: False
-  upgrade:
-    no_hooks: False
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: osh-ingress-kube-system
-  values:
-    release_uuid: ${RELEASE_UUID}
-    labels:
-      server:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-      error_server:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-    pod:
-      replicas:
-        error_page: 2
-    deployment:
-      mode: cluster
-      type: DaemonSet
-    network:
-      host_namespace: true
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: ingress
-    reference: master
-  dependencies:
-    - helm-toolkit
----
-schema: armada/ChartGroup/v1
-metadata:
-  schema: metadata/Document/v1
-  name: cluster-ingress-controller
-data:
-  description: "Cluster Ingress Controller"
-  sequenced: False
-  chart_group:
-    - ingress-kube-system
----
-schema: armada/Manifest/v1
-metadata:
-  schema: metadata/Document/v1
-  name: armada-manifest
-data:
-  release_prefix: osh
-  chart_groups:
-    - cluster-ingress-controller
diff --git a/tools/deployment/armada/manifests/armada-lma.yaml b/tools/deployment/armada/manifests/armada-lma.yaml
deleted file mode 100644
index 1ffb6fef65..0000000000
--- a/tools/deployment/armada/manifests/armada-lma.yaml
+++ /dev/null
@@ -1,1340 +0,0 @@
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: helm-toolkit
-data:
-  chart_name: helm-toolkit
-  release: helm-toolkit
-  namespace: helm-toolkit
-  values: {}
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: helm-toolkit
-    reference: master
-  dependencies: []
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: osh-infra-ingress-controller
-data:
-  chart_name: osh-infra-ingress-controller
-  release: osh-infra-ingress-controller
-  namespace: osh-infra
-  wait:
-    timeout: 1800
-    labels:
-      release_group: osh-infra-osh-infra-ingress-controller
-  install:
-    no_hooks: False
-  upgrade:
-    no_hooks: False
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: osh-infra-osh-infra-ingress-controller
-  values:
-    release_uuid: ${RELEASE_UUID}
-    labels:
-      node_selector_key: openstack-control-plane
-      node_selector_value: enabled
-    pod:
-      replicas:
-        error_page: 2
-        ingress: 2
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: ingress
-    reference: master
-  dependencies:
-    - helm-toolkit
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: osh-infra-ceph-config
-data:
-  chart_name: osh-infra-ceph-config
-  release: osh-infra-ceph-config
-  namespace: osh-infra
-  wait:
-    timeout: 1800
-    labels:
-      release_group: osh-infra-osh-infra-ceph-config
-  install:
-    no_hooks: False
-  upgrade:
-    no_hooks: False
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: osh-infra-osh-infra-ceph-config
-  values:
-    release_uuid: ${RELEASE_UUID}
-    endpoints:
-      ceph_mon:
-        namespace: ceph
-    labels:
-      jobs:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-    network:
-      public: ${CEPH_NETWORK}
-      cluster: ${CEPH_NETWORK}
-    deployment:
-      ceph: False
-      rbd_provisioner: False
-      cephfs_provisioner: False
-      client_secrets: True
-    bootstrap:
-      enabled: False
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: ceph-provisioners
-    reference: master
-  dependencies:
-    - helm-toolkit
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: osh-infra-radosgw
-data:
-  chart_name: osh-infra-radosgw
-  release: osh-infra-radosgw
-  namespace: osh-infra
-  wait:
-    timeout: 1800
-    labels:
-      release_group: osh-infra-osh-infra-radosgw
-  install:
-    no_hooks: False
-  upgrade:
-    no_hooks: False
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: osh-infra-radosgw-osh-infra
-  values:
-    release_uuid: ${RELEASE_UUID}
-    endpoints:
-      object_store:
-        namespace: osh-infra
-      ceph_object_store:
-        namespace: osh-infra
-        auth:
-          admin:
-            access_key: ${RADOSGW_S3_ADMIN_ACCESS_KEY}
-            secret_key: ${RADOSGW_S3_ADMIN_SECRET_KEY}
-      ceph_mon:
-        namespace: ceph
-    labels:
-      job:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-    bootstrap:
-      enabled: False
-    conf:
-      rgw_ks:
-        enabled: False
-      rgw_s3:
-        enabled: True
-    network:
-      public: ${CEPH_NETWORK}
-      cluster: ${CEPH_NETWORK}
-    deployment:
-      ceph: True
-      rbd_provisioner: False
-      cephfs_provisioner: False
-      client_secrets: False
-      rgw_keystone_user_and_endpoints: False
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: ceph-rgw
-    reference: master
-  dependencies:
-    - helm-toolkit
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: osh-infra-ldap
-data:
-  chart_name: osh-infra-ldap
-  release: osh-infra-ldap
-  namespace: osh-infra
-  wait:
-    timeout: 1800
-    labels:
-      release_group: osh-infra-osh-infra-ldap
-  install:
-    no_hooks: false
-  upgrade:
-    no_hooks: False
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: osh-infra-osh-infra-ldap
-  values:
-    release_uuid: ${RELEASE_UUID}
-    labels:
-      server:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-      job:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-    bootstrap:
-      enabled: true
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: ldap
-    reference: master
-  dependencies:
-    - helm-toolkit
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: osh-infra-mariadb
-data:
-  chart_name: osh-infra-mariadb
-  release: osh-infra-mariadb
-  namespace: osh-infra
-  wait:
-    timeout: 1800
-    labels:
-      release_group: osh-infra-osh-infra-mariadb
-  install:
-    no_hooks: False
-  upgrade:
-    no_hooks: False
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: osh-infra-osh-infra-mariadb
-  values:
-    release_uuid: ${RELEASE_UUID}
-    pod:
-      replicas:
-        server: 1
-    endpoints:
-      oslo_db:
-        auth:
-          admin:
-            password: ${DB_ADMIN_PASSWORD}
-    volume:
-      enabled: false
-    labels:
-      server:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-      prometheus_mysql_exporter:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: mariadb
-    reference: master
-  dependencies:
-    - helm-toolkit
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: elasticsearch
-data:
-  chart_name: elasticsearch
-  release: elasticsearch
-  namespace: osh-infra
-  wait:
-    timeout: 3600
-    labels:
-      release_group: osh-infra-elasticsearch
-  install:
-    no_hooks: False
-  upgrade:
-    no_hooks: False
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: osh-infra-elasticsearch
-        - type: pod
-          labels:
-            release_group: osh-infra-elasticsearch
-            component: test
-  values:
-    release_uuid: ${RELEASE_UUID}
-    endpoints:
-      elasticsearch:
-        auth:
-          admin:
-            password: ${ELASTICSEARCH_ADMIN_PASSWORD}
-      object_store:
-        namespace: osh-infra
-      ceph_object_store:
-        namespace: osh-infra
-        auth:
-          admin:
-            access_key: ${RADOSGW_S3_ADMIN_ACCESS_KEY}
-            secret_key: ${RADOSGW_S3_ADMIN_SECRET_KEY}
-          elasticsearch:
-            access_key: ${RADOSGW_S3_ELASTICSEARCH_ACCESS_KEY}
-            secret_key: ${RADOSGW_S3_ELASTICSEARCH_SECRET_KEY}
-    pod:
-      replicas:
-        data: 1
-        master: 2
-    labels:
-      elasticsearch:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-      job:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-    conf:
-      elasticsearch:
-        env:
-          java_opts: "-Xms512m -Xmx512m"
-        snapshots:
-          enabled: true
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: elasticsearch
-    reference: master
-  dependencies:
-    - helm-toolkit
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: fluent-logging
-data:
-  chart_name: fluent-logging
-  release: fluent-logging
-  namespace: osh-infra
-  wait:
-    timeout: 3600
-    labels:
-      release_group: osh-infra-fluent-logging
-  test:
-    enabled: false
-  install:
-    no_hooks: False
-  upgrade:
-    no_hooks: False
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: osh-infra-fluent-logging
-        - type: pod
-          labels:
-            release_group: osh-infra-fluent-logging
-            component: test
-  values:
-    release_uuid: ${RELEASE_UUID}
-    conf:
-      fluentbit:
-        - service:
-            header: service
-            Flush: 30
-            Daemon: Off
-            Log_Level: info
-            Parsers_File: parsers.conf
-        - ceph_cluster_logs:
-            header: input
-            Name: tail
-            Tag: ceph.cluster.*
-            Path: /var/log/ceph/ceph.log
-            DB: /var/log/ceph.db
-            Parsers: syslog
-            Mem_Buf_Limit: 5MB
-            DB.Sync: Normal
-            Buffer_Chunk_Size: 1M
-            Buffer_Max_Size: 1M
-        - ceph_audit_logs:
-            header: input
-            Name: tail
-            Tag: ceph.audit.*
-            Path: /var/log/ceph/ceph.audit.log
-            DB: /var/log/ceph.db
-            Parsers: syslog
-            Mem_Buf_Limit: 5MB
-            DB.Sync: Normal
-            Buffer_Chunk_Size: 1M
-            Buffer_Max_Size: 1M
-        - ceph_mon_logs:
-            header: input
-            Name: tail
-            Tag: ceph.mon.*
-            Path: /var/log/ceph/ceph-mon**.log
-            DB: /var/log/ceph.db
-            Parsers: syslog
-            Mem_Buf_Limit: 5MB
-            DB.Sync: Normal
-            Buffer_Chunk_Size: 1M
-            Buffer_Max_Size: 1M
-        - ceph_osd_logs:
-            header: input
-            Name: tail
-            Tag: ceph.osd.*
-            Path: /var/log/ceph/ceph-osd**.log
-            DB: /var/log/ceph.db
-            Parsers: syslog
-            Mem_Buf_Limit: 5MB
-            DB.Sync: Normal
-            Buffer_Chunk_Size: 1M
-            Buffer_Max_Size: 1M
-        - kernel_messages:
-            header: input
-            Name: tail
-            Tag: kernel
-            Path: /var/log/kern.log
-            DB: /var/log/kern.db
-            Mem_Buf_Limit: 5MB
-            DB.Sync: Normal
-            Buffer_Chunk_Size: 1M
-            Buffer_Max_Size: 1M
-        - kubelet:
-            header: input
-            Name: systemd
-            Tag: journal.*
-            Path: ${JOURNAL_PATH}
-            Systemd_Filter: _SYSTEMD_UNIT=kubelet.service
-            DB: /var/log/kubelet.db
-            Mem_Buf_Limit: 5MB
-            DB.Sync: Normal
-            Buffer_Chunk_Size: 1M
-            Buffer_Max_Size: 1M
-        - libvirt:
-            header: input
-            Name: tail
-            Tag: libvirt
-            Path: /var/log/libvirt/libvirtd.log
-            DB: /var/log/libvirt.db
-            Mem_Buf_Limit: 5MB
-            DB.Sync: Normal
-            Buffer_Chunk_Size: 1M
-            Buffer_Max_Size: 1M
-        - qemu:
-            header: input
-            Name: tail
-            Tag: qemu
-            Path: /var/log/libvirt/qemu/*.log
-            DB: /var/log/qemu.db
-            Mem_Buf_Limit: 5MB
-            DB.Sync: Normal
-            Buffer_Chunk_Size: 1M
-            Buffer_Max_Size: 1M
-        - nagios:
-            header: input
-            Name: tail
-            Tag: nagios
-            Path: /opt/nagios/var/nagios.log
-            DB: /var/log/nagios.db
-            Mem_Buf_Limit: 5MB
-            DB.Sync: Normal
-            Buffer_Chunk_Size: 1M
-            Buffer_Max_Size: 1M
-        - docker_daemon:
-            header: input
-            Name: systemd
-            Tag: journal.*
-            Path: ${JOURNAL_PATH}
-            Systemd_Filter: _SYSTEMD_UNIT=docker.service
-            DB: /var/log/docker.db
-            Mem_Buf_Limit: 5MB
-            DB.Sync: Normal
-            Buffer_Chunk_Size: 1M
-            Buffer_Max_Size: 1M
-        - libvirt_record_modifier:
-            header: filter
-            Name: record_modifier
-            Match: libvirt
-            Record: hostname ${HOSTNAME}
-        - qemu_record_modifier:
-            header: filter
-            Name: record_modifier
-            Match: qemu
-            Record: hostname ${HOSTNAME}
-        - kernel_record_modifier:
-            header: filter
-            Name: record_modifier
-            Match: kernel
-            Record: hostname ${HOSTNAME}
-        - systemd_modify_fields:
-            header: filter
-            Name: modify
-            Match: journal.**
-            Rename:
-              _BOOT_ID: BOOT_ID
-              _CAP_EFFECTIVE: CAP_EFFECTIVE
-              _CMDLINE: CMDLINE
-              _COMM: COMM
-              _EXE: EXE
-              _GID: GID
-              _HOSTNAME: HOSTNAME
-              _MACHINE_ID: MACHINE_ID
-              _PID: PID
-              _SYSTEMD_CGROUP: SYSTEMD_CGROUP
-              _SYSTEMD_SLICE: SYSTEMD_SLICE
-              _SYSTEMD_UNIT: SYSTEMD_UNIT
-              _UID: UID
-              _TRANSPORT: TRANSPORT
-        - containers_tail:
-            header: input
-            Name: tail
-            Tag: kube.*
-            Path: /var/log/containers/*.log
-            Parser: docker
-            DB: /var/log/flb_kube.db
-            Mem_Buf_Limit: 5MB
-            DB.Sync: Normal
-            Buffer_Chunk_Size: 1M
-            Buffer_Max_Size: 1M
-        - drop_fluentd_logs:
-            header: output
-            Name: "null"
-            Match: "**.fluentd**"
-        - kube_filter:
-            header: filter
-            Name: kubernetes
-            Match: kube.*
-            Merge_JSON_Log: On
-        - fluentd_output:
-            header: output
-            Name: forward
-            Match: "*"
-            Host: ${FLUENTD_HOST}
-            Port: ${FLUENTD_PORT}
-      parsers:
-        - docker:
-            header: parser
-            Name: docker
-            Format: json
-            Time_Key: time
-            Time_Format: "%Y-%m-%dT%H:%M:%S.%L"
-            Time_Keep: On
-        - syslog:
-            header: parser
-            Name: syslog
-            Format: regex
-            Regex: '^(?<time>.*[0-9]{2}:[0-9]{2}:[0-9]{2}) (?<host>[^ ]*) (?<app>[a-zA-Z0-9_\/\.\-]*)(?:\[(?<pid>[0-9]+)\])?(?:[^\:]*\:)? (?<log>.+)$'
-            Time_Key: time
-            Time_Format: "%Y-%m-%dT%H:%M:%S.%L"
-            Time_Keep: On
-            Types: "pid:integer"
-      fluentd:
-        - metrics_agent:
-            header: source
-            type: monitor_agent
-            bind: 0.0.0.0
-            port: 24220
-        - fluentbit_forward:
-            header: source
-            type: forward
-            port: "#{ENV['FLUENTD_PORT']}"
-            bind: 0.0.0.0
-        - drop_fluent_logs:
-            header: match
-            type: "null"
-            expression: "fluent.*"
-        - add_container_name:
-            header: filter
-            type: record_transformer
-            expression: "kube.**"
-            enable_ruby: true
-            record:
-              -
-                - header: record
-                  container_name: ${record["kubernetes"]["container_name"]}
-        - remove_openstack_pod_logged_events:
-            header: filter
-            type: grep
-            expression: "kube.**"
-            exclude:
-              -
-                - header: exclude
-                  key: container_name
-                  pattern: ^(cinder-api|cinder-scheduler|cinder-volume|cinder-backup|glance-api|glance-registry|heat-api|heat-cfn|heat-engine|keystone-api|neutron-dhcp-agent|neutron-l3-agent|neutron-server|nova-osapi|nova-api|nova-compute|nova-conductor|nova-consoleauth|nova-novncproxy|nova-scheduler)$
-          # NOTE(srwilkers): Look for specific keywords in the log key to determine
-          # log level of event
-        - tag_kubernetes_log_level:
-            header: match
-            type: rewrite_tag_filter
-            expression: "kube.var.log.containers.**.log"
-            rule:
-              -
-                - header: rule
-                  key: log
-                  pattern: /info/i
-                  tag: info.${tag}
-                - header: rule
-                  key: log
-                  pattern: /warn/i
-                  tag: warn.${tag}
-                - header: rule
-                  key: log
-                  pattern: /error/i
-                  tag: error.${tag}
-                - header: rule
-                  key: log
-                  pattern: /critical/i
-                  tag: critical.${tag}
-                - header: rule
-                  key: log
-                  pattern: (.+)
-                  tag: info.${tag}
-          # NOTE(srwilkers): Create new key for log level, and use the tag prefix
-          # added previously
-        - add_kubernetes_log_level_and_application_key:
-            header: filter
-            type: record_transformer
-            enable_ruby: true
-            expression: "**.kube.var.log.containers.**.log"
-            record:
-              -
-                - header: record
-                  level: ${tag_parts[0]}
-                  application: ${record["kubernetes"]["labels"]["application"]}
-        - add_openstack_application_key:
-            header: filter
-            type: record_transformer
-            expression: "openstack.**"
-            record:
-              -
-                - header: record
-                  application: ${tag_parts[1]}
-          #NOTE(srwilkers): This prefixes the tag for oslo.log entries from the
-          # fluent handler/formatter with the log level, allowing for lookups on
-          # openstack logs with a particular log level (ie: error.openstack.keystone)
-        - tag_openstack_log_level:
-            header: match
-            type: rewrite_tag_filter
-            expression: "openstack.**"
-            rule:
-              -
-                - header: rule
-                  key: level
-                  pattern: INFO
-                  tag: info.${tag}
-                - header: rule
-                  key: level
-                  pattern: WARN
-                  tag: warn.${tag}
-                - header: rule
-                  key: level
-                  pattern: ERROR
-                  tag: error.${tag}
-                - header: rule
-                  key: level
-                  pattern: CRITICAL
-                  tag: critical.${tag}
-        - libvirt_elasticsearch:
-            header: match
-            type: elasticsearch
-            user: "#{ENV['ELASTICSEARCH_USERNAME']}"
-            password: "#{ENV['ELASTICSEARCH_PASSWORD']}"
-            expression: "libvirt"
-            include_tag_key: true
-            host: "#{ENV['ELASTICSEARCH_HOST']}"
-            port: "#{ENV['ELASTICSEARCH_PORT']}"
-            logstash_format: true
-            logstash_prefix: libvirt
-            buffer_chunk_limit: 2M
-            buffer_queue_limit: 8
-            flush_interval: "5"
-            max_retry_wait: 300
-            disable_retry_limit: ""
-        - nagios_elasticsearch:
-            header: match
-            type: elasticsearch
-            user: "#{ENV['ELASTICSEARCH_USERNAME']}"
-            password: "#{ENV['ELASTICSEARCH_PASSWORD']}"
-            expression: "nagios"
-            include_tag_key: true
-            host: "#{ENV['ELASTICSEARCH_HOST']}"
-            port: "#{ENV['ELASTICSEARCH_PORT']}"
-            logstash_format: true
-            logstash_prefix: nagios
-            buffer_chunk_limit: 2M
-            buffer_queue_limit: 8
-            flush_interval: "5"
-            max_retry_wait: 300
-            disable_retry_limit: ""
-        - qemu_elasticsearch:
-            header: match
-            type: elasticsearch
-            user: "#{ENV['ELASTICSEARCH_USERNAME']}"
-            password: "#{ENV['ELASTICSEARCH_PASSWORD']}"
-            expression: "qemu"
-            include_tag_key: true
-            host: "#{ENV['ELASTICSEARCH_HOST']}"
-            port: "#{ENV['ELASTICSEARCH_PORT']}"
-            logstash_format: true
-            logstash_prefix: qemu
-            buffer_chunk_limit: 2M
-            buffer_queue_limit: 8
-            flush_interval: "5"
-            max_retry_wait: 300
-            disable_retry_limit: ""
-        - journal_elasticsearch:
-            header: match
-            type: elasticsearch
-            user: "#{ENV['ELASTICSEARCH_USERNAME']}"
-            password: "#{ENV['ELASTICSEARCH_PASSWORD']}"
-            expression: "journal.**"
-            include_tag_key: true
-            host: "#{ENV['ELASTICSEARCH_HOST']}"
-            port: "#{ENV['ELASTICSEARCH_PORT']}"
-            logstash_format: true
-            logstash_prefix: journal
-            buffer_chunk_limit: 2M
-            buffer_queue_limit: 8
-            flush_interval: "5"
-            max_retry_wait: 300
-            disable_retry_limit: ""
-        - syslog_elasticsearch:
-            header: match
-            type: elasticsearch
-            user: "#{ENV['ELASTICSEARCH_USERNAME']}"
-            password: "#{ENV['ELASTICSEARCH_PASSWORD']}"
-            expression: "syslog.**"
-            include_tag_key: true
-            host: "#{ENV['ELASTICSEARCH_HOST']}"
-            port: "#{ENV['ELASTICSEARCH_PORT']}"
-            logstash_format: true
-            logstash_prefix: syslog
-            buffer_chunk_limit: 2M
-            buffer_queue_limit: 8
-            flush_interval: "5"
-            max_retry_wait: 300
-            disable_retry_limit: ""
-            type_name: syslog
-        - ceph_elasticsearch:
-            header: match
-            type: elasticsearch
-            user: "#{ENV['ELASTICSEARCH_USERNAME']}"
-            password: "#{ENV['ELASTICSEARCH_PASSWORD']}"
-            expression: "ceph**"
-            include_tag_key: true
-            host: "#{ENV['ELASTICSEARCH_HOST']}"
-            port: "#{ENV['ELASTICSEARCH_PORT']}"
-            logstash_format: true
-            logstash_prefix: ceph
-            buffer_chunk_limit: 2M
-            buffer_queue_limit: 8
-            flush_interval: "5"
-            max_retry_wait: 300
-            disable_retry_limit: ""
-        - kernel_elasticsearch:
-            header: match
-            type: elasticsearch
-            user: "#{ENV['ELASTICSEARCH_USERNAME']}"
-            password: "#{ENV['ELASTICSEARCH_PASSWORD']}"
-            expression: "kernel"
-            include_tag_key: true
-            host: "#{ENV['ELASTICSEARCH_HOST']}"
-            port: "#{ENV['ELASTICSEARCH_PORT']}"
-            logstash_format: true
-            logstash_prefix: kernel
-            buffer_chunk_limit: 2M
-            buffer_queue_limit: 8
-            flush_interval: "5"
-            max_retry_wait: 300
-            disable_retry_limit: ""
-        - oslo_fluentd_elasticsearch:
-            header: match
-            type: elasticsearch
-            user: "#{ENV['ELASTICSEARCH_USERNAME']}"
-            password: "#{ENV['ELASTICSEARCH_PASSWORD']}"
-            expression: "**.openstack.*"
-            include_tag_key: true
-            host: "#{ENV['ELASTICSEARCH_HOST']}"
-            port: "#{ENV['ELASTICSEARCH_PORT']}"
-            logstash_format: true
-            logstash_prefix: openstack
-            buffer_chunk_limit: 2M
-            buffer_queue_limit: 8
-            flush_interval: "5"
-            max_retry_wait: 300
-            disable_retry_limit: ""
-            type_name: oslo_openstack_fluentd
-        - elasticsearch:
-            header: match
-            type: elasticsearch
-            user: "#{ENV['ELASTICSEARCH_USERNAME']}"
-            password: "#{ENV['ELASTICSEARCH_PASSWORD']}"
-            expression: "**"
-            include_tag_key: true
-            host: "#{ENV['ELASTICSEARCH_HOST']}"
-            port: "#{ENV['ELASTICSEARCH_PORT']}"
-            logstash_format: true
-            buffer_chunk_limit: 2M
-            buffer_queue_limit: 8
-            flush_interval: "5"
-            max_retry_wait: 300
-            disable_retry_limit: ""
-            type_name: docker_fluentd
-      fluentd_exporter:
-        log:
-          format: "logger:stdout?json=true"
-          level: "info"
-      templates:
-        syslog:
-          template: "syslog-*"
-          index_patterns: "syslog-*"
-          settings:
-            number_of_shards: 1
-          mappings:
-            syslog:
-              properties:
-                cluster:
-                  type: keyword
-                app:
-                  type: keyword
-                pid:
-                  type: integer
-                host:
-                  type: keyword
-                log:
-                  type: text
-        oslo_openstack_fluentd:
-          template: "openstack-*"
-          index_patterns: "openstack-*"
-          settings:
-            number_of_shards: 1
-          mappings:
-            oslo_openstack_fluentd:
-              properties:
-                extra:
-                  properties:
-                    project:
-                      type: text
-                      norms: false
-                    version:
-                      type: text
-                      norms: false
-                filename:
-                  type: text
-                  norms: false
-                funcname:
-                  type: text
-                  norms: false
-                message:
-                  type: text
-                  norms: false
-                process_name:
-                  type: keyword
-                  index: false
-        docker_fluentd:
-          template: "logstash-*"
-          index_patterns: "logstash-*"
-          settings:
-            number_of_shards: 1
-          mappings:
-            docker_fluentd:
-              properties:
-                kubernetes:
-                  properties:
-                    container_name:
-                      type: keyword
-                      index: false
-                    docker_id:
-                      type: keyword
-                      index: false
-                    host:
-                      type: keyword
-                      index: false
-                    namespace_name:
-                      type: keyword
-                      index: false
-                    pod_id:
-                      type: keyword
-                      index: false
-                    pod_name:
-                      type: keyword
-                      index: false
-    endpoints:
-      elasticsearch:
-        auth:
-          admin:
-            password: ${ELASTICSEARCH_ADMIN_PASSWORD}
-    pod:
-      replicas:
-        fluentd: 1
-    labels:
-      fluentd:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-      fluentbit:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-      prometheus_fluentd_exporter:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-      job:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: fluent-logging
-    reference: master
-  dependencies:
-    - helm-toolkit
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: kibana
-data:
-  chart_name: kibana
-  release: kibana
-  namespace: osh-infra
-  wait:
-    timeout: 1800
-    labels:
-      release_group: osh-infra-kibana
-  install:
-    no_hooks: False
-  upgrade:
-    no_hooks: False
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: osh-infra-kibana
-  values:
-    release_uuid: ${RELEASE_UUID}
-    conf:
-      create_kibana_indexes:
-        indexes:
-          - logstash
-          - openstack
-          - journal
-          - kernel
-          - ceph
-          - nagios
-          - libvirt
-          - qemu
-          - syslog
-    endpoints:
-      elasticsearch:
-        auth:
-          admin:
-            password: ${ELASTICSEARCH_ADMIN_PASSWORD}
-      kibana:
-        auth:
-          admin:
-            password: ${KIBANA_ADMIN_PASSWORD}
-    labels:
-      kibana:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-      job:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: kibana
-    reference: master
-  dependencies:
-    - helm-toolkit
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: prometheus
-data:
-  chart_name: prometheus
-  release: prometheus
-  namespace: osh-infra
-  wait:
-    timeout: 1800
-    labels:
-      release_group: osh-infra-prometheus
-  install:
-    no_hooks: False
-  upgrade:
-    no_hooks: False
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: osh-infra-prometheus
-        - type: pod
-          labels:
-            release_group: osh-infra-prometheus
-            component: test
-  values:
-    release_uuid: ${RELEASE_UUID}
-    endpoints:
-      monitoring:
-        auth:
-          admin:
-            password: ${PROMETHEUS_ADMIN_PASSWORD}
-    labels:
-      prometheus:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-      job:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-    pod:
-      replicas:
-        prometheus: 2
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: prometheus
-    reference: master
-  dependencies:
-    - helm-toolkit
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: prometheus-kube-state-metrics
-data:
-  chart_name: prometheus-kube-state-metrics
-  release: prometheus-kube-state-metrics
-  namespace: kube-system
-  wait:
-    timeout: 1800
-    labels:
-      release_group: osh-infra-prometheus-kube-state-metrics
-  install:
-    no_hooks: False
-  upgrade:
-    no_hooks: False
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: osh-infra-prometheus-kube-state-metrics
-  values:
-    release_uuid: ${RELEASE_UUID}
-    labels:
-      kube_state_metrics:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-      job:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: prometheus-kube-state-metrics
-    reference: master
-  dependencies:
-    - helm-toolkit
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: prometheus-node-exporter
-data:
-  chart_name: prometheus-node-exporter
-  release: prometheus-node-exporter
-  namespace: kube-system
-  wait:
-    timeout: 1800
-    labels:
-      release_group: osh-infra-prometheus-node-exporter
-  install:
-    no_hooks: False
-  upgrade:
-    no_hooks: False
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: osh-infra-prometheus-node-exporter
-  values:
-    release_uuid: ${RELEASE_UUID}
-    labels:
-      node_exporter:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-      job:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: prometheus-node-exporter
-    reference: master
-  dependencies:
-    - helm-toolkit
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: prometheus-alertmanager
-data:
-  chart_name: prometheus-alertmanager
-  release: prometheus-alertmanager
-  namespace: osh-infra
-  wait:
-    timeout: 1800
-    labels:
-      release_group: osh-infra-prometheus-alertmanager
-  install:
-    no_hooks: False
-  upgrade:
-    no_hooks: False
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: osh-infra-prometheus-alertmanager
-  values:
-    release_uuid: ${RELEASE_UUID}
-    pod:
-      replicas:
-        alertmanager: 1
-    labels:
-      alertmanager:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-      job:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: prometheus-alertmanager
-    reference: master
-  dependencies:
-    - helm-toolkit
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: nagios
-data:
-  chart_name: nagios
-  release: nagios
-  namespace: osh-infra
-  wait:
-    timeout: 1800
-    labels:
-      release_group: osh-infra-nagios
-  install:
-    no_hooks: False
-  upgrade:
-    no_hooks: False
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: osh-infra-nagios
-  values:
-    release_uuid: ${RELEASE_UUID}
-    endpoints:
-      monitoring:
-        auth:
-          admin:
-            password: ${PROMETHEUS_ADMIN_PASSWORD}
-      elasticsearch:
-        auth:
-          admin:
-            password: ${ELASTICSEARCH_ADMIN_PASSWORD}
-    labels:
-      nagios:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-      job:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: nagios
-    reference: master
-  dependencies:
-    - helm-toolkit
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: grafana
-data:
-  chart_name: grafana
-  release: grafana
-  namespace: osh-infra
-  wait:
-    timeout: 1800
-    labels:
-      release_group: osh-infra-grafana
-  install:
-    no_hooks: False
-  upgrade:
-    no_hooks: False
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: osh-infra-grafana
-        - type: pod
-          labels:
-            release_group: osh-infra-grafana
-            component: test
-  values:
-    release_uuid: ${RELEASE_UUID}
-    endpoints:
-      monitoring:
-        auth:
-          admin:
-            password: ${PROMETHEUS_ADMIN_PASSWORD}
-      oslo_db:
-        namespace: osh-infra
-        auth:
-          admin:
-            password: ${DB_ADMIN_PASSWORD}
-          user:
-            password: ${GRAFANA_DB_PASSWORD}
-      oslo_db_session:
-        namespace: osh-infra
-        auth:
-          admin:
-            password: ${DB_ADMIN_PASSWORD}
-          user:
-            password: ${GRAFANA_SESSION_DB_PASSWORD}
-      grafana:
-        auth:
-          admin:
-            password: ${GRAFANA_ADMIN_PASSWORD}
-    labels:
-      grafana:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-      job:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: grafana
-    reference: master
-  dependencies:
-    - helm-toolkit
----
-schema: armada/ChartGroup/v1
-metadata:
-  schema: metadata/Document/v1
-  name: osh-infra-ingress-controller
-data:
-  description: "LMA Ingress Controller"
-  sequenced: False
-  chart_group:
-    - osh-infra-ingress-controller
----
-schema: armada/ChartGroup/v1
-metadata:
-  schema: metadata/Document/v1
-  name: osh-infra-ceph-config
-data:
-  description: "LMA Ceph Config"
-  sequenced: True
-  chart_group:
-    - osh-infra-ceph-config
----
-schema: armada/ChartGroup/v1
-metadata:
-  schema: metadata/Document/v1
-  name: osh-infra-radosgw
-data:
-  description: "RadosGW for osh-infra"
-  sequenced: True
-  chart_group:
-    - osh-infra-radosgw
----
-schema: armada/ChartGroup/v1
-metadata:
-  schema: metadata/Document/v1
-  name: osh-infra-ldap
-data:
-  description: "LDAP"
-  sequenced: True
-  chart_group:
-    - osh-infra-ldap
----
-schema: armada/ChartGroup/v1
-metadata:
-  schema: metadata/Document/v1
-  name: osh-infra-mariadb
-data:
-  description: "Mariadb"
-  sequenced: True
-  chart_group:
-    - osh-infra-mariadb
----
-schema: armada/ChartGroup/v1
-metadata:
-  schema: metadata/Document/v1
-  name: osh-infra-logging
-data:
-  description: 'Logging Infrastructure'
-  sequenced: True
-  chart_group:
-    - elasticsearch
-    - fluent-logging
----
-schema: armada/ChartGroup/v1
-metadata:
-  schema: metadata/Document/v1
-  name: osh-infra-monitoring
-data:
-  description: 'Monitoring Infrastructure'
-  sequenced: False
-  chart_group:
-    - prometheus-alertmanager
-    - prometheus-node-exporter
-    - prometheus-kube-state-metrics
-    - prometheus
-    - nagios
----
-schema: armada/ChartGroup/v1
-metadata:
-  schema: metadata/Document/v1
-  name: osh-infra-dashboards
-data:
-  description: 'Logging and Monitoring Dashboards'
-  sequenced: False
-  chart_group:
-    - grafana
-    - kibana
----
-schema: armada/Manifest/v1
-metadata:
-  schema: metadata/Document/v1
-  name: armada-manifest
-data:
-  release_prefix: osh-infra
-  chart_groups:
-    - osh-infra-ingress-controller
-    - osh-infra-ceph-config
-    - osh-infra-radosgw
-    - osh-infra-ldap
-    - osh-infra-logging
-    - osh-infra-monitoring
-    - osh-infra-mariadb
-    - osh-infra-dashboards
diff --git a/tools/deployment/armada/manifests/armada-osh.yaml b/tools/deployment/armada/manifests/armada-osh.yaml
index 9188e0d4b7..fd6b32ff6b 100644
--- a/tools/deployment/armada/manifests/armada-osh.yaml
+++ b/tools/deployment/armada/manifests/armada-osh.yaml
@@ -136,7 +136,7 @@ data:
       oslo_db:
         auth:
           admin:
-            password: ${DB_ADMIN_PASSWORD}
+            password: ${OSH_MARIADB_ADMIN_PASSWORD}
     monitoring:
       prometheus:
         enabled: True
@@ -355,7 +355,7 @@ data:
       oslo_db:
         auth:
           admin:
-            password: ${DB_ADMIN_PASSWORD}
+            password: ${OSH_MARIADB_ADMIN_PASSWORD}
           keystone:
             password: ${KEYSTONE_DB_PASSWORD}
       oslo_messaging:
@@ -396,6 +396,8 @@ data:
     timeout: 1800
     labels:
       release_group: osh-radosgw-openstack
+  test:
+    enabled: false
   install:
     no_hooks: False
   upgrade:
@@ -552,7 +554,7 @@ data:
       oslo_db:
         auth:
           admin:
-            password: ${DB_ADMIN_PASSWORD}
+            password: ${OSH_MARIADB_ADMIN_PASSWORD}
           glance:
             password: ${GLANCE_DB_PASSWORD}
       oslo_cache:
@@ -634,7 +636,7 @@ data:
       oslo_db:
         auth:
           admin:
-            password: ${DB_ADMIN_PASSWORD}
+            password: ${OSH_MARIADB_ADMIN_PASSWORD}
           cinder:
             password: ${CINDER_DB_PASSWORD}
       oslo_cache:
@@ -882,19 +884,19 @@ data:
       oslo_db:
         auth:
           admin:
-            password: ${DB_ADMIN_PASSWORD}
+            password: ${OSH_MARIADB_ADMIN_PASSWORD}
           nova:
             password: ${NOVA_DB_PASSWORD}
       oslo_db_api:
         auth:
           admin:
-            password: ${DB_ADMIN_PASSWORD}
+            password: ${OSH_MARIADB_ADMIN_PASSWORD}
           nova:
             password: ${NOVA_DB_PASSWORD}
       oslo_db_cell0:
         auth:
           admin:
-            password: ${DB_ADMIN_PASSWORD}
+            password: ${OSH_MARIADB_ADMIN_PASSWORD}
           nova:
             password: ${NOVA_DB_PASSWORD}
       oslo_cache:
@@ -1084,7 +1086,7 @@ data:
       oslo_db:
         auth:
           admin:
-            password: ${DB_ADMIN_PASSWORD}
+            password: ${OSH_MARIADB_ADMIN_PASSWORD}
           neutron:
             password: ${NEUTRON_DB_PASSWORD}
       oslo_cache:
@@ -1326,7 +1328,7 @@ data:
       oslo_db:
         auth:
           admin:
-            password: ${DB_ADMIN_PASSWORD}
+            password: ${OSH_MARIADB_ADMIN_PASSWORD}
           heat:
             password: ${HEAT_DB_PASSWORD}
       oslo_cache:
diff --git a/tools/gate/playbooks/armada-fullstack-deploy.yaml b/tools/gate/playbooks/armada-fullstack-deploy.yaml
deleted file mode 100644
index 8c6895a471..0000000000
--- a/tools/gate/playbooks/armada-fullstack-deploy.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2017 The Openstack-Helm Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- hosts: primary
-  gather_facts: True
-  tasks:
-    - name: installing ipcalc on Ubuntu
-      become: true
-      become_user: root
-      when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
-      apt:
-        name: ipcalc
-        state: present
-    - name: Install python3-pip for armada
-      environment:
-        OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
-        OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
-        zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"
-      shell: |
-        set xe;
-        ./tools/deployment/armada/010-armada-host-setup.sh
-      args:
-        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
-    - name: Build armada
-      environment:
-        OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
-        OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
-        zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"
-      shell: |
-        set xe;
-        ./tools/deployment/armada/015-armada-build.sh
-      args:
-        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
-    - name: Render all Armada manifests
-      environment:
-        OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
-        OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
-        zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"
-      shell: |
-        set -xe;
-        ./tools/deployment/armada/020-armada-render-manifests.sh
-      args:
-        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
-    - name: Validate all Armada manifests
-      environment:
-        OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
-        OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
-        zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"
-      shell: |
-        set -xe;
-        ./tools/deployment/armada/025-armada-validate-manifests.sh
-      args:
-        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
-    - name: Apply all Armada manifests
-      environment:
-        OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
-        OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
-        zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"
-      shell: |
-        set -xe;
-        ./tools/deployment/armada/030-armada-apply-manifests.sh
-      args:
-        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
diff --git a/tools/gate/playbooks/gather-armada-manifests.yaml b/tools/gate/playbooks/gather-armada-manifests.yaml
index f7575ca2c7..7be17497a7 100644
--- a/tools/gate/playbooks/gather-armada-manifests.yaml
+++ b/tools/gate/playbooks/gather-armada-manifests.yaml
@@ -25,7 +25,6 @@
       with_items:
         - armada-cluster-ingress
         - armada-ceph
-        - armada-lma
         - armada-osh
       args:
         executable: /bin/bash
diff --git a/zuul.d/jobs-openstack-helm.yaml b/zuul.d/jobs-openstack-helm.yaml
index ce25bdb45c..8044a432ca 100644
--- a/zuul.d/jobs-openstack-helm.yaml
+++ b/zuul.d/jobs-openstack-helm.yaml
@@ -162,24 +162,30 @@
 
 - job:
     timeout: 9600
-    name: openstack-helm-armada-fullstack-deploy
+    name: openstack-helm-armada-deploy
     parent: openstack-helm-functional-temp
+    nodeset: openstack-helm-five-node-ubuntu
     roles:
       - zuul: openstack/openstack-helm-infra
-    vars:
-      zuul_osh_infra_relative_path: ../openstack-helm-infra/
     pre-run:
       - tools/gate/playbooks/osh-infra-upgrade-host.yaml
       - tools/gate/playbooks/osh-infra-deploy-docker.yaml
       - tools/gate/playbooks/osh-infra-build.yaml
       - tools/gate/playbooks/osh-infra-deploy-k8s.yaml
-    run: tools/gate/playbooks/armada-fullstack-deploy.yaml
+    run: tools/gate/playbooks/osh-gate-runner.yaml
     post-run:
       - tools/gate/playbooks/osh-infra-collect-logs.yaml
       - tools/gate/playbooks/gather-armada-manifests.yaml
     required-projects:
       - openstack/openstack-helm-infra
-    nodeset: openstack-helm-five-node-ubuntu
+    vars:
+      zuul_osh_infra_relative_path: ../openstack-helm-infra/
+      gate_scripts:
+        - ./tools/deployment/armada/010-armada-host-setup.sh
+        - ./tools/deployment/armada/015-armada-build.sh
+        - ./tools/deployment/armada/020-armada-render-manifests.sh
+        - ./tools/deployment/armada/025-armada-validate-manifests.sh
+        - ./tools/deployment/armada/030-armada-apply-manifests.sh
 
 - job:
     name: openstack-helm-multinode-temp-ubuntu
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 2770a677fd..41ce1e4bbc 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -43,10 +43,11 @@
       jobs:
         - openstack-helm-multinode-temp-ubuntu
         - openstack-helm-ironic-ubuntu
+        - openstack-helm-armada-deploy
     experimental:
       jobs:
         # - openstack-helm-multinode-temp-centos
         # # NOTE(lamt): Make fedora job experimental until issues with gates are resolved.
         # - openstack-helm-multinode-temp-fedora
         # - openstack-helm-multinode-temp-tempest
-        - openstack-helm-armada-fullstack-deploy
+        - openstack-helm-armada-deploy