diff --git a/playbooks/gather-armada-manifests.yaml b/playbooks/gather-armada-manifests.yaml deleted file mode 100644 index 5971d4134..000000000 --- a/playbooks/gather-armada-manifests.yaml +++ /dev/null @@ -1,44 +0,0 @@ -# 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 - tasks: - - name: "creating directory for rendered armada manifests" - file: - path: "/tmp/logs/armada" - state: directory - - - name: "retrieve all armada manifests" - shell: |- - cat /tmp/{{ manifest }}.yaml > /tmp/logs/armada/{{ manifest }}.yaml - loop_control: - loop_var: manifest - with_items: - - armada-cluster-ingress - - armada-ceph - - armada-lma - - updated-armada-cluster-ingress - - updated-armada-ceph - - updated-armada-lma - - updated-password-armada-lma - args: - executable: /bin/bash - ignore_errors: True - - - name: "Downloads armada manifests to executor" - synchronize: - src: "/tmp/logs/armada" - dest: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}" - mode: pull - ignore_errors: True -... diff --git a/tools/deployment/armada/010-armada-host-setup.sh b/tools/deployment/armada/010-armada-host-setup.sh deleted file mode 100755 index b0809918f..000000000 --- a/tools/deployment/armada/010-armada-host-setup.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -# 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. - -set -xe - -sudo apt-get install -y python3-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 deleted file mode 100755 index 5c9257c77..000000000 --- a/tools/deployment/armada/015-armada-build.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -# 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. - -set -xe - -TMP_DIR=$(mktemp -d) - -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 deleted file mode 100755 index 9cc714463..000000000 --- a/tools/deployment/armada/020-armada-render-manifests.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -# 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. - -set -xe - -source ./tools/deployment/armada/generate-osh-infra-passwords.sh -: ${OSH_INFRA_PATH:="./"} - -[ -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' -. /etc/os-release -if [ "x${ID}" == "xubuntu" ] && \ - [ "$(uname -r | awk -F "." '{ print $2 }')" -lt "5" ]; then - export CRUSH_TUNABLES=hammer -else - export CRUSH_TUNABLES=null -fi - -export CEPH_NETWORK=$(./tools/deployment/multinode/kube-node-subnet.sh) -export CEPH_FS_ID="$(cat /tmp/ceph-fs-uuid.txt)" -export RELEASE_UUID=$(uuidgen) -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" -for manifest in $manifests; do - echo "Rendering $manifest manifest" - envsubst < ./tools/deployment/armada/manifests/$manifest.yaml > /tmp/$manifest.yaml -done diff --git a/tools/deployment/armada/025-armada-validate-manifests.sh b/tools/deployment/armada/025-armada-validate-manifests.sh deleted file mode 100755 index 41884153f..000000000 --- a/tools/deployment/armada/025-armada-validate-manifests.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -# 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. - -set -xe - -manifests="armada-cluster-ingress armada-ceph armada-lma" -for manifest in $manifests; do - echo "Validating $manifest manifest" - armada validate /tmp/$manifest.yaml -done diff --git a/tools/deployment/armada/030-armada-apply-manifests.sh b/tools/deployment/armada/030-armada-apply-manifests.sh deleted file mode 100755 index 6edfd38e2..000000000 --- a/tools/deployment/armada/030-armada-apply-manifests.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -# 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. - -set -xe - -manifests="armada-cluster-ingress armada-ceph armada-lma" -for manifest in $manifests; do - echo "Applying $manifest manifest" - armada apply /tmp/$manifest.yaml -done diff --git a/tools/deployment/armada/035-armada-update-uuids.sh b/tools/deployment/armada/035-armada-update-uuids.sh deleted file mode 100755 index a459a2361..000000000 --- a/tools/deployment/armada/035-armada-update-uuids.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -# 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. - -set -xe - -# NOTE(srwilkers): sexport all passwords and environment variables used in the original -# manifests -while read -r line; do $line; done < /tmp/osh-infra-passwords.env -: ${OSH_INFRA_PATH:="../openstack-helm-infra"} -: ${OSH_PATH:="./"} - -export CEPH_NETWORK=$(./tools/deployment/multinode/kube-node-subnet.sh) -export CEPH_FS_ID="$(cat /tmp/ceph-fs-uuid.txt)" -export RELEASE_UUID=$(uuidgen) -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" -for manifest in $manifests; do - echo "Rendering updated-$manifest manifest" - envsubst < ./tools/deployment/armada/manifests/$manifest.yaml > /tmp/updated-$manifest.yaml - - echo "Validating updated-$manifest manifest" - armada validate /tmp/updated-$manifest.yaml - - echo "Applying updated-$manifest manifest" - armada apply /tmp/updated-$manifest.yaml -done diff --git a/tools/deployment/armada/040-armada-update-passwords.sh b/tools/deployment/armada/040-armada-update-passwords.sh deleted file mode 100755 index e86c6cfce..000000000 --- a/tools/deployment/armada/040-armada-update-passwords.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -# 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. - -set -xe - -# Empty previous password file contents -> /tmp/osh-infra-passwords.env - -source ./tools/deployment/armada/generate-osh-infra-passwords.sh -: ${OSH_INFRA_PATH:="../openstack-helm-infra"} - -#NOTE(portdirect): to use RBD devices with Ubuntu kernels < 4.5 this -# should be set to 'hammer' -. /etc/os-release -if [ "x${ID}" == "xubuntu" ] && \ - [ "$(uname -r | awk -F "." '{ print $2 }')" -lt "5" ]; then - export CRUSH_TUNABLES=hammer -else - export CRUSH_TUNABLES=null -fi - -export CEPH_NETWORK=$(./tools/deployment/multinode/kube-node-subnet.sh) -export CEPH_FS_ID="$(cat /tmp/ceph-fs-uuid.txt)" -export RELEASE_UUID=$(uuidgen) -export OSH_INFRA_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}' - -echo "Rendering updated-password-armada-lma manifest" -envsubst < ./tools/deployment/armada/manifests/armada-lma.yaml > /tmp/updated-password-armada-lma.yaml - -echo "Validating update-password-armada-lma manifest" -armada validate /tmp/updated-password-armada-lma.yaml - -echo "Applying update-password-armada-lma manifest" -armada apply /tmp/updated-password-armada-lma.yaml diff --git a/tools/deployment/armada/generate-osh-infra-passwords.sh b/tools/deployment/armada/generate-osh-infra-passwords.sh deleted file mode 100755 index bc674e225..000000000 --- a/tools/deployment/armada/generate-osh-infra-passwords.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -# 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. - -set -xe - -passwords="ELASTICSEARCH_ADMIN_PASSWORD \ - GRAFANA_ADMIN_PASSWORD \ - GRAFANA_DB_PASSWORD \ - GRAFANA_SESSION_DB_PASSWORD \ - MARIADB_ADMIN_PASSWORD \ - MARIADB_EXPORTER_PASSWORD \ - MARIADB_SST_PASSWORD \ - NAGIOS_ADMIN_PASSWORD \ - PROMETHEUS_ADMIN_PASSWORD \ - RADOSGW_S3_ADMIN_ACCESS_KEY \ - RADOSGW_S3_ADMIN_SECRET_KEY \ - RADOSGW_S3_ELASTICSEARCH_ACCESS_KEY \ - RADOSGW_S3_ELASTICSEARCH_SECRET_KEY" - -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/osh-infra-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 2cfbe65a5..000000000 --- a/tools/deployment/armada/manifests/armada-ceph.yaml +++ /dev/null @@ -1,358 +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 - resources: - - type: daemonset - - type: deployment - - type: job - 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 - resources: - - type: daemonset - native: - enabled: false - install: - no_hooks: False - upgrade: - no_hooks: False - pre: - delete: - - type: job - labels: - release_group: osh-ceph-osd - - type: pod - labels: - release_group: osh-ceph-osd - component: test - 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 - - type: pod - labels: - release_group: osh-ceph-client - component: test - 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 - csi_rbd_provisioner: true - cephfs_provisioner: false - client_secrets: false - storageclass: - cephfs: - provision_storage_class: false - manifests: - deployment_cephfs_provisioner: false - job_cephfs_client_key: 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 71087a0d1..000000000 --- a/tools/deployment/armada/manifests/armada-cluster-ingress.yaml +++ /dev/null @@ -1,85 +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 2ec1e4cbb..000000000 --- a/tools/deployment/armada/manifests/armada-lma.yaml +++ /dev/null @@ -1,1016 +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 - test: - timeout: 600 - 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 - csi_rbd_provisioner: False - cephfs_provisioner: False - client_secrets: True - storageclass: - cephfs: - provision_storage_class: False - 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 - test: - enabled: false - install: - no_hooks: False - upgrade: - no_hooks: False - pre: - delete: - - type: job - labels: - release_group: osh-infra-osh-infra-radosgw - - type: pod - labels: - release_group: osh-infra-osh-infra-radosgw - component: test - 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 - csi_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 - resources: - - type: deployment - - type: statefulset - test: - timeout: 600 - 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: ${MARIADB_ADMIN_PASSWORD} - exporter: - password: ${MARIADB_EXPORTER_PASSWORD} - sst: - password: ${MARIADB_SST_PASSWORD} - 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 - resources: - - type: deployment - - type: job - - type: statefulset - test: - timeout: 600 - 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} - monitoring: - prometheus: - enabled: true - 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: 2 - 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: - client: "-Xms512m -Xmx512m" - data: "-Xms512m -Xmx512m" - master: "-Xms512m -Xmx512m" - snapshots: - enabled: true - templates: - syslog: - template: "syslog-*" - index_patterns: "syslog-*" - settings: - number_of_shards: 1 - mappings: - 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: - 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: - 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 - curator: - action_file: - actions: - 1: - action: delete_indices - description: >- - "Delete indices older than 365 days" - options: - timeout_override: - continue_if_exception: False - ignore_empty_list: True - disable_action: True - filters: - - filtertype: pattern - kind: prefix - value: logstash- - - filtertype: age - source: name - direction: older - timestring: '%Y.%m.%d' - unit: days - unit_count: 365 - source: - type: local - location: ${OSH_INFRA_PATH} - subpath: elasticsearch - reference: master - dependencies: - - helm-toolkit -... ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: fluentbit -data: - chart_name: fluentbit - release: fluentbit - namespace: osh-infra - wait: - timeout: 3600 - labels: - release_group: osh-infra-fluentbit - resources: - - type: daemonset - test: - timeout: 600 - install: - no_hooks: False - upgrade: - no_hooks: False - pre: - delete: - - type: job - labels: - release_group: osh-infra-fluentbit - - type: pod - labels: - release_group: osh-infra-fluentbit - component: test - values: - release_uuid: ${RELEASE_UUID} - labels: - fluentbit: - node_selector_key: openstack-control-plane - node_selector_value: enabled - source: - type: local - location: ${OSH_INFRA_PATH} - subpath: fluentbit - reference: master - dependencies: - - helm-toolkit -... ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: fluentd -data: - chart_name: fluentd - release: fluentd - namespace: osh-infra - wait: - timeout: 3600 - labels: - release_group: osh-infra-fluentd - resources: - - type: deployment - test: - timeout: 600 - install: - no_hooks: False - upgrade: - no_hooks: False - pre: - delete: - - type: job - labels: - release_group: osh-infra-fluentd - - type: pod - labels: - release_group: osh-infra-fluentd - component: test - values: - release_uuid: ${RELEASE_UUID} - monitoring: - prometheus: - enabled: true - endpoints: - elasticsearch: - auth: - admin: - password: ${ELASTICSEARCH_ADMIN_PASSWORD} - pod: - replicas: - fluentd: 1 - labels: - fluentd: - 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: fluentd - 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 - resources: - - type: deployment - - type: job - 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} - 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: 3600 - labels: - release_group: osh-infra-prometheus - resources: - - type: statefulset - test: - timeout: 600 - 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: 2400 - labels: - release_group: osh-infra-nagios - resources: - - type: deployment - test: - timeout: 600 - 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 - resources: - - type: deployment - - type: job - test: - timeout: 600 - 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: ${MARIADB_ADMIN_PASSWORD} - user: - password: ${GRAFANA_DB_PASSWORD} - oslo_db_session: - namespace: osh-infra - auth: - admin: - password: ${MARIADB_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 - - fluentd - - fluentbit -... ---- -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/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 26fe8c799..accc487b7 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -475,74 +475,6 @@ - ./tools/deployment/elastic-beats/090-elastic-filebeat.sh - ./tools/deployment/elastic-beats/100-elastic-packetbeat.sh -- job: - name: openstack-helm-infra-armada-deploy - parent: openstack-helm-infra-functional - nodeset: openstack-helm-five-node-ubuntu - timeout: 7200 - pre-run: - - playbooks/osh-infra-upgrade-host.yaml - - playbooks/osh-infra-deploy-docker.yaml - - playbooks/osh-infra-build.yaml - - playbooks/osh-infra-deploy-k8s.yaml - post-run: - - playbooks/osh-infra-collect-logs.yaml - - playbooks/gather-armada-manifests.yaml - vars: - gate_scripts_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-infra-armada-update-uuid - parent: openstack-helm-infra-functional - nodeset: openstack-helm-five-node-ubuntu - timeout: 7200 - pre-run: - - playbooks/osh-infra-upgrade-host.yaml - - playbooks/osh-infra-deploy-docker.yaml - - playbooks/osh-infra-build.yaml - - playbooks/osh-infra-deploy-k8s.yaml - post-run: - - playbooks/osh-infra-collect-logs.yaml - - playbooks/gather-armada-manifests.yaml - vars: - gate_scripts_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 - - ./tools/deployment/armada/035-armada-update-uuids.sh - -- job: - name: openstack-helm-infra-armada-update-passwords - parent: openstack-helm-infra-functional - nodeset: openstack-helm-five-node-ubuntu - timeout: 7200 - pre-run: - - playbooks/osh-infra-upgrade-host.yaml - - playbooks/osh-infra-deploy-docker.yaml - - playbooks/osh-infra-build.yaml - - playbooks/osh-infra-deploy-k8s.yaml - post-run: - - playbooks/osh-infra-collect-logs.yaml - - playbooks/gather-armada-manifests.yaml - vars: - gate_scripts_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 - - ./tools/deployment/armada/040-armada-update-passwords.sh - - job: name: openstack-helm-infra-aio-podsecuritypolicy parent: openstack-helm-infra-functional diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 0e11a47cd..a50863a92 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -52,9 +52,6 @@ - openstack-helm-infra-validate-minikube-aio # - openstack-helm-infra-tenant-ceph # - openstack-helm-infra-five-ubuntu - # - openstack-helm-infra-armada-deploy - # - openstack-helm-infra-armada-update-uuid - # - openstack-helm-infra-armada-update-passwords experimental: jobs: # NOTE(srwilkers): Disable fedora experimental jobs until issues resolved @@ -64,9 +61,6 @@ # - openstack-helm-infra-five-ubuntu - openstack-helm-infra-elastic-beats # - openstack-helm-infra-tenant-ceph - # - openstack-helm-infra-armada-deploy - # - openstack-helm-infra-armada-update-uuid - # - openstack-helm-infra-armada-update-passwords - openstack-helm-infra-federated-monitoring - openstack-helm-infra-local-storage - openstack-helm-infra-aio-network-policy