From 4822aa729c51d206929ccabff81464461d3096b1 Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <wilkers.steve@gmail.com>
Date: Tue, 14 Aug 2018 13:01:05 -0500
Subject: [PATCH] Armada: Manifest updates for Ocata release

This patchset updates the chart configuration overrides to account
for functionality supported with the move to Ocata over Newton.
This includes updating the OpenStack service logging configuration
to leverage the fluent handler/formatter that was introduced in the
Ocata release, updating Fluentd's configuration to filter out
duplicate logs, tagging logged events with their log level, and
creating separate indexes for the different log types created by
the elasticsearch templates. This also adds support for leveraging
ceph-radosgw's s3 API for Elasticsearch snapshots.

This also removes the barbican chart deployment from the
armada gate, to help alleviate resource consumption.

Change-Id: I45128bf102909e1762b832fc16ad04bedcfe4f00
---
 .../armada/010-armada-host-setup.sh           |    2 +-
 tools/deployment/armada/015-armada-build.sh   |    3 +-
 .../armada/020-armada-render-manifests.sh     |    6 +-
 tools/deployment/armada/generate-passwords.sh |    8 +-
 .../{multinode => manifests}/armada-ceph.yaml |    4 -
 .../armada-cluster-ingress.yaml               |    0
 .../armada/manifests/armada-lma.yaml          | 1236 +++++++++++++++++
 .../{multinode => manifests}/armada-osh.yaml  |  469 +++++--
 .../armada/multinode/armada-lma.yaml          |  721 ----------
 .../playbooks/armada-fullstack-deploy.yaml    |    5 -
 zuul.d/jobs-openstack-helm.yaml               |    1 -
 zuul.d/project.yaml                           |   20 +-
 12 files changed, 1643 insertions(+), 832 deletions(-)
 rename tools/deployment/armada/{multinode => manifests}/armada-ceph.yaml (99%)
 rename tools/deployment/armada/{multinode => manifests}/armada-cluster-ingress.yaml (100%)
 create mode 100644 tools/deployment/armada/manifests/armada-lma.yaml
 rename tools/deployment/armada/{multinode => manifests}/armada-osh.yaml (73%)
 delete mode 100644 tools/deployment/armada/multinode/armada-lma.yaml

diff --git a/tools/deployment/armada/010-armada-host-setup.sh b/tools/deployment/armada/010-armada-host-setup.sh
index 3e3b3a2c59..33ffff38dc 100755
--- a/tools/deployment/armada/010-armada-host-setup.sh
+++ b/tools/deployment/armada/010-armada-host-setup.sh
@@ -17,4 +17,4 @@
 set -xe
 
 sudo apt-get install -y python3-pip
-sudo pip3 install --upgrade pip
+sudo pip3 install --upgrade pip requests
diff --git a/tools/deployment/armada/015-armada-build.sh b/tools/deployment/armada/015-armada-build.sh
index 86eaf2e703..aefb53a871 100755
--- a/tools/deployment/armada/015-armada-build.sh
+++ b/tools/deployment/armada/015-armada-build.sh
@@ -17,7 +17,8 @@
 set -xe
 
 TMP_DIR=$(mktemp -d)
-  git clone --depth 1 http://github.com/openstack/airship-armada.git ${TMP_DIR}/armada
+
+git clone --depth 1 http://github.com/openstack/airship-armada.git ${TMP_DIR}/armada
 sudo pip3 install ${TMP_DIR}/armada
 sudo make build -C ${TMP_DIR}/armada
 sudo rm -rf ${TMP_DIR}
diff --git a/tools/deployment/armada/020-armada-render-manifests.sh b/tools/deployment/armada/020-armada-render-manifests.sh
index 129ccb2125..fd597375ba 100755
--- a/tools/deployment/armada/020-armada-render-manifests.sh
+++ b/tools/deployment/armada/020-armada-render-manifests.sh
@@ -37,8 +37,12 @@ export TUNNEL_DEVICE=$(ip -4 route list 0/0 | awk '{ print $5; exit }')
 export OSH_INFRA_PATH
 export OSH_PATH
 
+# NOTE(srwilkers): We add this here due to envsubst expanding the ${tag} placeholder in
+# 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
   echo "Rendering $manifest manifest"
-  envsubst < ./tools/deployment/armada/multinode/$manifest.yaml > /tmp/$manifest.yaml
+  envsubst < ./tools/deployment/armada/manifests/$manifest.yaml > /tmp/$manifest.yaml
 done
diff --git a/tools/deployment/armada/generate-passwords.sh b/tools/deployment/armada/generate-passwords.sh
index 0bbbec9e8e..b6bc32a2ef 100755
--- a/tools/deployment/armada/generate-passwords.sh
+++ b/tools/deployment/armada/generate-passwords.sh
@@ -50,9 +50,15 @@ passwords="BARBICAN_DB_PASSWORD \
     OPENSTACK_EXPORTER_USER_PASSWORD \
     PROMETHEUS_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
-  export $password=$(tr -dc A-Za-z0-9 < /dev/urandom 2>/dev/null | head -c 20)
+  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
 done
diff --git a/tools/deployment/armada/multinode/armada-ceph.yaml b/tools/deployment/armada/manifests/armada-ceph.yaml
similarity index 99%
rename from tools/deployment/armada/multinode/armada-ceph.yaml
rename to tools/deployment/armada/manifests/armada-ceph.yaml
index d3473d5b0f..0862c9518d 100644
--- a/tools/deployment/armada/multinode/armada-ceph.yaml
+++ b/tools/deployment/armada/manifests/armada-ceph.yaml
@@ -118,8 +118,6 @@ data:
             journal:
               type: directory
               location: /var/lib/openstack-helm/ceph/osd/journal-one
-    logging:
-      fluentd: true
   source:
     type: local
     location: ${OSH_INFRA_PATH}
@@ -190,8 +188,6 @@ data:
             journal:
               type: directory
               location: /var/lib/openstack-helm/ceph/osd/journal-one
-    logging:
-      fluentd: true
   source:
     type: local
     location: ${OSH_INFRA_PATH}
diff --git a/tools/deployment/armada/multinode/armada-cluster-ingress.yaml b/tools/deployment/armada/manifests/armada-cluster-ingress.yaml
similarity index 100%
rename from tools/deployment/armada/multinode/armada-cluster-ingress.yaml
rename to tools/deployment/armada/manifests/armada-cluster-ingress.yaml
diff --git a/tools/deployment/armada/manifests/armada-lma.yaml b/tools/deployment/armada/manifests/armada-lma.yaml
new file mode 100644
index 0000000000..e93321c7f0
--- /dev/null
+++ b/tools/deployment/armada/manifests/armada-lma.yaml
@@ -0,0 +1,1236 @@
+---
+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:
+    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:
+    endpoints:
+      identity:
+        namespace: openstack
+      object_store:
+        namespace: ceph
+      ceph_mon:
+        namespace: ceph
+    labels:
+      jobs:
+        node_selector_key: openstack-control-plane
+        node_selector_value: enabled
+    network:
+      public: ${CEPH_NETWORK}
+      cluster: ${CEPH_NETWORK}
+    deployment:
+      storage_secrets: False
+      ceph: False
+      rbd_provisioner: False
+      cephfs_provisioner: False
+      client_secrets: True
+      rgw_keystone_user_and_endpoints: False
+    bootstrap:
+      enabled: False
+    conf:
+      rgw_ks:
+        enabled: True
+  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:
+    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:
+      storage_secrets: False
+      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:
+    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:
+    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:
+    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:
+    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
+        - 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
+        - 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}
+        - 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:
+    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:
+    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:
+    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:
+    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:
+    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:
+    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:
+    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/multinode/armada-osh.yaml b/tools/deployment/armada/manifests/armada-osh.yaml
similarity index 73%
rename from tools/deployment/armada/multinode/armada-osh.yaml
rename to tools/deployment/armada/manifests/armada-osh.yaml
index 2098ec3ea9..ef39003bc6 100644
--- a/tools/deployment/armada/multinode/armada-osh.yaml
+++ b/tools/deployment/armada/manifests/armada-osh.yaml
@@ -277,7 +277,71 @@ data:
             release_group: osh-keystone
             component: test
   values:
+    conf:
+      logging:
+        loggers:
+          keys:
+            - root
+            - keystone
+        handlers:
+          keys:
+            - stdout
+            - stderr
+            - 'null'
+            - fluent
+        formatters:
+          keys:
+            - context
+            - default
+            - fluent
+        logger_root:
+          level: WARNING
+          handlers: 'null'
+        logger_keystone:
+          level: INFO
+          handlers:
+            - fluent
+            - stdout
+          qualname: keystone
+        logger_amqp:
+          level: WARNING
+          handlers: stderr
+          qualname: amqp
+        logger_amqplib:
+          level: WARNING
+          handlers: stderr
+          qualname: amqplib
+        logger_eventletwsgi:
+          level: WARNING
+          handlers: stderr
+          qualname: eventlet.wsgi.server
+        logger_sqlalchemy:
+          level: WARNING
+          handlers: stderr
+          qualname: sqlalchemy
+        logger_boto:
+          level: WARNING
+          handlers: stderr
+          qualname: boto
+        handler_null:
+          class: logging.NullHandler
+          formatter: default
+          args: ()
+        handler_stdout:
+          class: StreamHandler
+          args: (sys.stdout,)
+          formatter: context
+        handler_stderr:
+          class: StreamHandler
+          args: (sys.stderr,)
+          formatter: context
+        formatter_context:
+          class: oslo_log.formatters.ContextFormatter
+        formatter_default:
+          format: "%(message)s"
     endpoints:
+      fluentd:
+        namespace: osh-infra
       identity:
         name: keystone
         namespace: openstack
@@ -412,7 +476,71 @@ data:
             release_group: osh-glance
             component: test
   values:
+    conf:
+      logging:
+        loggers:
+          keys:
+            - root
+            - glance
+        handlers:
+          keys:
+            - stdout
+            - stderr
+            - 'null'
+            - fluent
+        formatters:
+          keys:
+            - context
+            - default
+            - fluent
+        logger_root:
+          level: WARNING
+          handlers: 'null'
+        logger_glance:
+          level: INFO
+          handlers:
+            - fluent
+            - stdout
+          qualname: glance
+        logger_amqp:
+          level: WARNING
+          handlers: stderr
+          qualname: amqp
+        logger_amqplib:
+          level: WARNING
+          handlers: stderr
+          qualname: amqplib
+        logger_eventletwsgi:
+          level: WARNING
+          handlers: stderr
+          qualname: eventlet.wsgi.server
+        logger_sqlalchemy:
+          level: WARNING
+          handlers: stderr
+          qualname: sqlalchemy
+        logger_boto:
+          level: WARNING
+          handlers: stderr
+          qualname: boto
+        handler_null:
+          class: logging.NullHandler
+          formatter: default
+          args: ()
+        handler_stdout:
+          class: StreamHandler
+          args: (sys.stdout,)
+          formatter: context
+        handler_stderr:
+          class: StreamHandler
+          args: (sys.stderr,)
+          formatter: context
+        formatter_context:
+          class: oslo_log.formatters.ContextFormatter
+        formatter_default:
+          format: "%(message)s"
     endpoints:
+      fluentd:
+        namespace: osh-infra
       identity:
         auth:
           admin:
@@ -455,13 +583,6 @@ data:
       glance:
         DEFAULT:
           enable_v1_api: true
-          enable_v2_registry: true
-    manifests:
-      deployment_registry: true
-      ingress_registry: true
-      pdb_registry: true
-      service_ingress_registry: true
-      service_registry: true
   source:
     type: local
     location: ${OSH_PATH}
@@ -499,6 +620,8 @@ data:
             component: test
   values:
     endpoints:
+      fluentd:
+        namespace: osh-infra
       identity:
         auth:
           admin:
@@ -545,6 +668,67 @@ data:
         scheduler: 1
         backup: 1
     conf:
+      logging:
+        loggers:
+          keys:
+            - root
+            - cinder
+        handlers:
+          keys:
+            - stdout
+            - stderr
+            - 'null'
+            - fluent
+        formatters:
+          keys:
+            - context
+            - default
+            - fluent
+        logger_root:
+          level: WARNING
+          handlers: 'null'
+        logger_cinder:
+          level: INFO
+          handlers:
+            - fluent
+            - stdout
+          qualname: cinder
+        logger_amqp:
+          level: WARNING
+          handlers: stderr
+          qualname: amqp
+        logger_amqplib:
+          level: WARNING
+          handlers: stderr
+          qualname: amqplib
+        logger_eventletwsgi:
+          level: WARNING
+          handlers: stderr
+          qualname: eventlet.wsgi.server
+        logger_sqlalchemy:
+          level: WARNING
+          handlers: stderr
+          qualname: sqlalchemy
+        logger_boto:
+          level: WARNING
+          handlers: stderr
+          qualname: boto
+        handler_null:
+          class: logging.NullHandler
+          formatter: default
+          args: ()
+        handler_stdout:
+          class: StreamHandler
+          args: (sys.stdout,)
+          formatter: context
+        handler_stderr:
+          class: StreamHandler
+          args: (sys.stderr,)
+          formatter: context
+        formatter_context:
+          class: oslo_log.formatters.ContextFormatter
+        formatter_default:
+          format: "%(message)s"
       cinder:
         DEFAULT:
           backup_driver: cinder.backup.drivers.swift
@@ -676,6 +860,8 @@ data:
             component: cell-setup
   values:
     endpoints:
+      fluentd:
+        namespace: osh-infra
       identity:
         name: keystone
         auth:
@@ -764,6 +950,67 @@ data:
         scheduler: 2
         novncproxy: 1
     conf:
+      logging:
+        loggers:
+          keys:
+            - root
+            - nova
+        handlers:
+          keys:
+            - stdout
+            - stderr
+            - 'null'
+            - fluent
+        formatters:
+          keys:
+            - context
+            - default
+            - fluent
+        logger_root:
+          level: WARNING
+          handlers: 'null'
+        logger_nova:
+          level: INFO
+          handlers:
+            - fluent
+            - stdout
+          qualname: nova
+        logger_amqp:
+          level: WARNING
+          handlers: stderr
+          qualname: amqp
+        logger_amqplib:
+          level: WARNING
+          handlers: stderr
+          qualname: amqplib
+        logger_eventletwsgi:
+          level: WARNING
+          handlers: stderr
+          qualname: eventlet.wsgi.server
+        logger_sqlalchemy:
+          level: WARNING
+          handlers: stderr
+          qualname: sqlalchemy
+        logger_boto:
+          level: WARNING
+          handlers: stderr
+          qualname: boto
+        handler_null:
+          class: logging.NullHandler
+          formatter: default
+          args: ()
+        handler_stdout:
+          class: StreamHandler
+          args: (sys.stdout,)
+          formatter: context
+        handler_stderr:
+          class: StreamHandler
+          args: (sys.stderr,)
+          formatter: context
+        formatter_context:
+          class: oslo_log.formatters.ContextFormatter
+        formatter_default:
+          format: "%(message)s"
       nova:
         libvirt:
           virt_type: qemu
@@ -817,6 +1064,8 @@ data:
             component: ks-endpoints
   values:
     endpoints:
+      fluentd:
+        namespace: osh-infra
       identity:
         auth:
           admin:
@@ -879,6 +1128,67 @@ data:
       interface:
         tunnel: ${TUNNEL_DEVICE}
     conf:
+      logging:
+        loggers:
+          keys:
+            - root
+            - neutron
+        handlers:
+          keys:
+            - stdout
+            - stderr
+            - 'null'
+            - fluent
+        formatters:
+          keys:
+            - context
+            - default
+            - fluent
+        logger_root:
+          level: WARNING
+          handlers: 'null'
+        logger_neutron:
+          level: INFO
+          handlers:
+            - fluent
+            - stdout
+          qualname: neutron
+        logger_amqp:
+          level: WARNING
+          handlers: stderr
+          qualname: amqp
+        logger_amqplib:
+          level: WARNING
+          handlers: stderr
+          qualname: amqplib
+        logger_eventletwsgi:
+          level: WARNING
+          handlers: stderr
+          qualname: eventlet.wsgi.server
+        logger_sqlalchemy:
+          level: WARNING
+          handlers: stderr
+          qualname: sqlalchemy
+        logger_boto:
+          level: WARNING
+          handlers: stderr
+          qualname: boto
+        handler_null:
+          class: logging.NullHandler
+          formatter: default
+          args: ()
+        handler_stdout:
+          class: StreamHandler
+          args: (sys.stdout,)
+          formatter: context
+        handler_stderr:
+          class: StreamHandler
+          args: (sys.stderr,)
+          formatter: context
+        formatter_context:
+          class: oslo_log.formatters.ContextFormatter
+        formatter_default:
+          format: "%(message)s"
       neutron:
         DEFAULT:
           l3_ha: True
@@ -931,7 +1241,71 @@ data:
             release_group: osh-heat
             component: test
   values:
+    conf:
+      logging:
+        loggers:
+          keys:
+            - root
+            - heat
+        handlers:
+          keys:
+            - stdout
+            - stderr
+            - 'null'
+            - fluent
+        formatters:
+          keys:
+            - context
+            - default
+            - fluent
+        logger_root:
+          level: WARNING
+          handlers: 'null'
+        logger_heat:
+          level: INFO
+          handlers:
+            - fluent
+            - stdout
+          qualname: heat
+        logger_amqp:
+          level: WARNING
+          handlers: stderr
+          qualname: amqp
+        logger_amqplib:
+          level: WARNING
+          handlers: stderr
+          qualname: amqplib
+        logger_eventletwsgi:
+          level: WARNING
+          handlers: stderr
+          qualname: eventlet.wsgi.server
+        logger_sqlalchemy:
+          level: WARNING
+          handlers: stderr
+          qualname: sqlalchemy
+        logger_boto:
+          level: WARNING
+          handlers: stderr
+          qualname: boto
+        handler_null:
+          class: logging.NullHandler
+          formatter: default
+          args: ()
+        handler_stdout:
+          class: StreamHandler
+          args: (sys.stdout,)
+          formatter: context
+        handler_stderr:
+          class: StreamHandler
+          args: (sys.stderr,)
+          formatter: context
+        formatter_context:
+          class: oslo_log.formatters.ContextFormatter
+        formatter_default:
+          format: "%(message)s"
     endpoints:
+      fluentd:
+        namespace: osh-infra
       identity:
         auth:
           admin:
@@ -990,74 +1364,6 @@ data:
     - helm-toolkit
 ---
 schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: barbican
-data:
-  chart_name: barbican
-  release: barbican
-  namespace: openstack
-  wait:
-    timeout: 1800
-    labels:
-      release_group: osh-barbican
-  install:
-    no_hooks: False
-  upgrade:
-    no_hooks: False
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: osh-barbican
-        - type: pod
-          labels:
-            release_group: osh-barbican
-            component: test
-  values:
-    endpoints:
-      identity:
-        auth:
-          admin:
-            password: ${KEYSTONE_ADMIN_PASSWORD}
-          barbican:
-            password: ${BARBICAN_USER_PASSWORD}
-      oslo_db:
-        auth:
-          admin:
-            password: ${DB_ADMIN_PASSWORD}
-          barbican:
-            password: ${BARBICAN_DB_PASSWORD}
-      oslo_cache:
-        auth:
-          memcache_secret_key: ${KEYSTONE_AUTHTOKEN_MEMCACHED_SECRET_KEY}
-      oslo_messaging:
-        auth:
-          admin:
-            username: rabbitmq-admin
-            password: ${RABBITMQ_ADMIN_PASSWORD}
-          barbican:
-            username: barbican-rabbitmq-user
-            password: ${BARBICAN_RABBITMQ_USER_PASSWORD}
-    labels:
-      api:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-      job:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-    pod:
-      replicas:
-        api: 2
-  source:
-    type: local
-    location: ${OSH_PATH}
-    subpath: barbican
-    reference: master
-  dependencies:
-    - helm-toolkit
----
-schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
   name: prometheus-openstack-exporter
@@ -1142,7 +1448,7 @@ metadata:
   schema: metadata/Document/v1
   name: deploy-rabbitmq
 data:
-  description: "Rabbitmq"
+  description: "RabbitMQ"
   sequenced: True
   chart_group:
     - rabbitmq
@@ -1211,16 +1517,6 @@ data:
     - heat
 ---
 schema: armada/ChartGroup/v1
-metadata:
-  schema: metadata/Document/v1
-  name: openstack-barbican
-data:
-  description: "Deploy barbican"
-  sequenced: True
-  chart_group:
-    - barbican
----
-schema: armada/ChartGroup/v1
 metadata:
   schema: metadata/Document/v1
   name: prometheus-openstack-exporter
@@ -1248,5 +1544,4 @@ data:
     - openstack-cinder
     - openstack-compute-kit
     - openstack-heat
-    - openstack-barbican
     - prometheus-openstack-exporter
diff --git a/tools/deployment/armada/multinode/armada-lma.yaml b/tools/deployment/armada/multinode/armada-lma.yaml
deleted file mode 100644
index afb0b3bcee..0000000000
--- a/tools/deployment/armada/multinode/armada-lma.yaml
+++ /dev/null
@@ -1,721 +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:
-    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:
-    endpoints:
-      identity:
-        namespace: openstack
-      object_store:
-        namespace: ceph
-      ceph_mon:
-        namespace: ceph
-    labels:
-      jobs:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-    network:
-      public: ${CEPH_NETWORK}
-      cluster: ${CEPH_NETWORK}
-    deployment:
-      storage_secrets: False
-      ceph: False
-      rbd_provisioner: False
-      cephfs_provisioner: False
-      client_secrets: True
-      rgw_keystone_user_and_endpoints: False
-    bootstrap:
-      enabled: False
-    conf:
-      rgw_ks:
-        enabled: True
-  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-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:
-    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:
-    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
-  test:
-    enabled: true
-  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:
-    endpoints:
-      elasticsearch:
-        auth:
-          admin:
-            password: ${ELASTICSEARCH_ADMIN_PASSWORD}
-    pod:
-      replicas:
-        data: 1
-        client: 1
-    monitoring:
-      prometheus:
-        enabled: True
-    labels:
-      elasticsearch:
-        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: 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: true
-  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:
-    endpoints:
-      elasticsearch:
-        auth:
-          admin:
-            password: ${ELASTICSEARCH_ADMIN_PASSWORD}
-    monitoring:
-      prometheus:
-        enabled: True
-    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:
-    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
-  test:
-    enabled: true
-  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:
-    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
-    endpoints:
-      monitoring:
-        auth:
-          admin:
-            password: ${PROMETHEUS_ADMIN_PASSWORD}
-  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:
-    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:
-    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:
-    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:
-    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
-  test:
-    enabled: true
-  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:
-    endpoints:
-      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}
-      monitoring:
-        auth:
-          admin:
-            password: ${PROMETHEUS_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-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-ldap
-    - osh-infra-logging
-    - osh-infra-monitoring
-    - osh-infra-mariadb
-    - osh-infra-dashboards
diff --git a/tools/gate/playbooks/armada-fullstack-deploy.yaml b/tools/gate/playbooks/armada-fullstack-deploy.yaml
index 882d99f29e..8c6895a471 100644
--- a/tools/gate/playbooks/armada-fullstack-deploy.yaml
+++ b/tools/gate/playbooks/armada-fullstack-deploy.yaml
@@ -24,7 +24,6 @@
         state: present
     - name: Install python3-pip for armada
       environment:
-        OSH_OPENSTACK_RELEASE: "{{ osh_openstack_release }}"
         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 }}"
@@ -35,7 +34,6 @@
         chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Build armada
       environment:
-        OSH_OPENSTACK_RELEASE: "{{ osh_openstack_release }}"
         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 }}"
@@ -46,7 +44,6 @@
         chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Render all Armada manifests
       environment:
-        OSH_OPENSTACK_RELEASE: "{{ osh_openstack_release }}"
         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 }}"
@@ -57,7 +54,6 @@
         chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Validate all Armada manifests
       environment:
-        OSH_OPENSTACK_RELEASE: "{{ osh_openstack_release }}"
         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 }}"
@@ -68,7 +64,6 @@
         chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
     - name: Apply all Armada manifests
       environment:
-        OSH_OPENSTACK_RELEASE: "{{ osh_openstack_release }}"
         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 }}"
diff --git a/zuul.d/jobs-openstack-helm.yaml b/zuul.d/jobs-openstack-helm.yaml
index 2c70904ae4..ce25bdb45c 100644
--- a/zuul.d/jobs-openstack-helm.yaml
+++ b/zuul.d/jobs-openstack-helm.yaml
@@ -167,7 +167,6 @@
     roles:
       - zuul: openstack/openstack-helm-infra
     vars:
-      osh_openstack_release: newton
       zuul_osh_infra_relative_path: ../openstack-helm-infra/
     pre-run:
       - tools/gate/playbooks/osh-infra-upgrade-host.yaml
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 43c885e303..f294012302 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -24,12 +24,12 @@
     check:
       jobs:
         - openstack-helm-lint
-        - openstack-helm-keystone
-        - openstack-helm-keystone-ldap
-        - openstack-helm-glance
-        - openstack-helm-heat
-        - openstack-helm-cinder
-        - openstack-helm-compute-kit
+        # - openstack-helm-keystone
+        # - openstack-helm-keystone-ldap
+        # - openstack-helm-glance
+        # - openstack-helm-heat
+        # - openstack-helm-cinder
+        # - openstack-helm-compute-kit
     gate:
       jobs:
         - openstack-helm-lint
@@ -45,8 +45,8 @@
         - openstack-helm-ironic-ubuntu
     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-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