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 b0809918f0..0000000000 --- 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 5c9257c776..0000000000 --- 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 1d4da1bf25..0000000000 --- a/tools/deployment/armada/020-armada-render-manifests.sh +++ /dev/null @@ -1,50 +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 - -: ${OSH_INFRA_PATH:="../openstack-helm-infra"} -: ${OSH_PATH:="./"} - -source ./tools/deployment/armada/generate-osh-passwords.sh - -[ -s /tmp/ceph-fs-uuid.txt ] || uuidgen > /tmp/ceph-fs-uuid.txt -#NOTE(portdirect): to use RBD devices with Ubuntu kernels < 4.5 this -# should be set to 'hammer' -. /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}' - -for manifest in armada-cluster-ingress armada-ceph; do - echo "Rendering $manifest manifest" - envsubst < ${OSH_INFRA_PATH}/tools/deployment/armada/manifests/$manifest.yaml > /tmp/$manifest.yaml -done - -echo "Rendering armada-osh manifest" -envsubst < ./tools/deployment/armada/manifests/armada-osh.yaml > /tmp/armada-osh.yaml diff --git a/tools/deployment/armada/025-armada-validate-manifests.sh b/tools/deployment/armada/025-armada-validate-manifests.sh deleted file mode 100755 index b68ff2c4eb..0000000000 --- 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-osh" -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 2d2a29d6e3..0000000000 --- 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-osh" -for manifest in $manifests; do - echo "Applying $manifest manifest" - armada apply /tmp/$manifest.yaml -done diff --git a/tools/deployment/armada/035-armada-update-uuid.sh b/tools/deployment/armada/035-armada-update-uuid.sh deleted file mode 100755 index 35121d36c8..0000000000 --- a/tools/deployment/armada/035-armada-update-uuid.sh +++ /dev/null @@ -1,53 +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): source all passwords and environment variables used in the original -# manifests -while read -r line; do $line; done < /tmp/osh-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" -for manifest in $manifests; do - echo "Rendering updated-$manifest manifest" - envsubst < ${OSH_INFRA_PATH}/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 - -echo "Rendering updated-armada-osh manifest" -envsubst < ./tools/deployment/armada/manifests/armada-osh.yaml > /tmp/updated-armada-osh.yaml - -echo "Validating updated-armada-osh manifest" -armada validate /tmp/updated-armada-osh.yaml - -echo "Applying updated-armada-osh manifest" -armada apply /tmp/updated-armada-osh.yaml 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 df558220dc..0000000000 --- a/tools/deployment/armada/040-armada-update-passwords.sh +++ /dev/null @@ -1,52 +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-passwords.env - -source ./tools/deployment/armada/generate-osh-passwords.sh -: ${OSH_INFRA_PATH:="../openstack-helm-infra"} -: ${OSH_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 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}' - -echo "Rendering new osh manifest" -envsubst < ./tools/deployment/armada/manifests/armada-osh.yaml > /tmp/updated-password-armada-osh.yaml - -echo "Validating new osh manifest" -armada validate /tmp/updated-password-armada-osh.yaml - -echo "Applying new osh manifest" -armada apply /tmp/updated-password-armada-osh.yaml diff --git a/tools/deployment/armada/generate-osh-passwords.sh b/tools/deployment/armada/generate-osh-passwords.sh deleted file mode 100755 index b4a6555ad2..0000000000 --- a/tools/deployment/armada/generate-osh-passwords.sh +++ /dev/null @@ -1,61 +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="BARBICAN_DB_PASSWORD \ - BARBICAN_RABBITMQ_USER_PASSWORD \ - BARBICAN_USER_PASSWORD \ - CINDER_DB_PASSWORD \ - CINDER_RABBITMQ_USER_PASSWORD \ - CINDER_TEST_USER_PASSWORD \ - CINDER_USER_PASSWORD \ - GLANCE_DB_PASSWORD \ - GLANCE_RABBITMQ_USER_PASSWORD \ - GLANCE_TEST_USER_PASSWORD \ - GLANCE_USER_PASSWORD \ - HEAT_DB_PASSWORD \ - HEAT_RABBITMQ_USER_PASSWORD \ - HEAT_STACK_PASSWORD \ - HEAT_TEST_USER_PASSWORD \ - HEAT_TRUSTEE_PASSWORD \ - HEAT_USER_PASSWORD \ - KEYSTONE_ADMIN_PASSWORD \ - KEYSTONE_AUTHTOKEN_MEMCACHED_SECRET_KEY \ - KEYSTONE_DB_PASSWORD \ - KEYSTONE_RABBITMQ_USER_PASSWORD \ - KEYSTONE_TEST_USER_PASSWORD \ - METADATA_PROXY_SHARED_SECRET \ - NEUTRON_DB_PASSWORD \ - NEUTRON_RABBITMQ_USER_PASSWORD \ - NEUTRON_TEST_USER_PASSWORD \ - NEUTRON_USER_PASSWORD \ - NOVA_DB_PASSWORD \ - NOVA_PLACEMENT_USER_PASSWORD \ - NOVA_RABBITMQ_USER_PASSWORD \ - NOVA_TEST_USER_PASSWORD \ - NOVA_USER_PASSWORD \ - OPENSTACK_EXPORTER_USER_PASSWORD \ - OSH_MARIADB_ADMIN_PASSWORD \ - OSH_MARIADB_EXPORTER_PASSWORD \ - OSH_MARIADB_SST_PASSWORD \ - RABBITMQ_ADMIN_PASSWORD \ - SWIFT_USER_PASSWORD" - -for password in $passwords -do - value=$(tr -dc A-Za-z0-9 < /dev/urandom 2>/dev/null | head -c 20) - export $password=$value - echo "export $password=$value" >> /tmp/osh-passwords.env -done diff --git a/tools/deployment/armada/manifests/armada-osh.yaml b/tools/deployment/armada/manifests/armada-osh.yaml deleted file mode 100644 index 453db1d6b3..0000000000 --- a/tools/deployment/armada/manifests/armada-osh.yaml +++ /dev/null @@ -1,1290 +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: openstack-ingress-controller -data: - chart_name: openstack-ingress-controller - release: openstack-ingress-controller - namespace: openstack - wait: - timeout: 1800 - labels: - release_group: osh-openstack-ingress-controller - resources: - - type: deployment - install: - no_hooks: False - upgrade: - no_hooks: False - pre: - delete: - - type: job - labels: - release_group: osh-openstack-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: openstack-ceph-config -data: - chart_name: openstack-ceph-config - release: openstack-ceph-config - namespace: openstack - wait: - timeout: 1800 - labels: - release_group: osh-openstack-ceph-config - install: - no_hooks: False - upgrade: - no_hooks: False - pre: - delete: - - type: job - labels: - release_group: osh-openstack-ceph-config - values: - release_uuid: ${RELEASE_UUID} - labels: - jobs: - node_selector_key: openstack-control-plane - node_selector_value: enabled - endpoints: - identity: - namespace: openstack - object_store: - namespace: ceph - ceph_mon: - namespace: ceph - 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: mariadb -data: - chart_name: mariadb - release: mariadb - namespace: openstack - wait: - timeout: 1800 - labels: - release_group: osh-mariadb - resources: - - type: statefulset - - type: job - native: - enabled: false - install: - no_hooks: False - upgrade: - no_hooks: False - pre: - delete: - - type: job - labels: - release_group: osh-mariadb - values: - release_uuid: ${RELEASE_UUID} - endpoints: - oslo_db: - auth: - admin: - password: ${OSH_MARIADB_ADMIN_PASSWORD} - exporter: - password: ${OSH_MARIADB_EXPORTER_PASSWORD} - sst: - password: ${OSH_MARIADB_SST_PASSWORD} - monitoring: - prometheus: - enabled: True - 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: memcached -data: - chart_name: memcached - release: memcached - namespace: openstack - wait: - timeout: 1800 - labels: - release_group: osh-memcached - resources: - - type: deployment - native: - enabled: false - install: - no_hooks: False - upgrade: - no_hooks: False - pre: - delete: - - type: job - labels: - release_group: osh-memcached - values: - release_uuid: ${RELEASE_UUID} - labels: - server: - node_selector_key: openstack-control-plane - node_selector_value: enabled - prometheus_memcached_exporter: - node_selector_key: openstack-control-plane - node_selector_value: enabled - monitoring: - prometheus: - enabled: true - source: - type: local - location: ${OSH_INFRA_PATH} - subpath: memcached - reference: master - dependencies: - - helm-toolkit ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: rabbitmq -data: - chart_name: rabbitmq - release: rabbitmq - namespace: openstack - wait: - timeout: 1800 - labels: - release_group: osh-rabbitmq - resources: - - type: statefulset - - type: job - native: - enabled: false - test: - enabled: true - timeout: 600 - install: - no_hooks: False - upgrade: - options: - force: true - recreate_pods: true - no_hooks: False - pre: - delete: - - type: job - labels: - release_group: osh-rabbitmq - - type: pod - labels: - release_group: osh-rabbitmq - component: test - values: - release_uuid: ${RELEASE_UUID} - endpoints: - oslo_messaging: - auth: - user: - username: rabbitmq-admin - password: ${RABBITMQ_ADMIN_PASSWORD} - monitoring: - prometheus: - enabled: True - labels: - server: - node_selector_key: openstack-control-plane - node_selector_value: enabled - prometheus_rabbitmq_exporter: - node_selector_key: openstack-control-plane - node_selector_value: enabled - source: - type: local - location: ${OSH_INFRA_PATH} - subpath: rabbitmq - reference: master - dependencies: - - helm-toolkit ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: keystone -data: - chart_name: keystone - release: keystone - namespace: openstack - wait: - timeout: 1800 - labels: - release_group: osh-keystone - resources: - - type: deployment - - type: job - native: - enabled: false - test: - enabled: true - timeout: 600 - install: - no_hooks: False - upgrade: - no_hooks: False - pre: - delete: - - type: job - labels: - release_group: osh-keystone - - type: pod - labels: - release_group: osh-keystone - component: test - values: - release_uuid: ${RELEASE_UUID} - endpoints: - identity: - name: keystone - namespace: openstack - auth: - admin: - password: ${KEYSTONE_ADMIN_PASSWORD} - test: - password: ${KEYSTONE_TEST_USER_PASSWORD} - oslo_cache: - auth: - memcache_secret_key: ${KEYSTONE_AUTHTOKEN_MEMCACHED_SECRET_KEY} - oslo_db: - auth: - admin: - password: ${OSH_MARIADB_ADMIN_PASSWORD} - keystone: - password: ${KEYSTONE_DB_PASSWORD} - oslo_messaging: - auth: - admin: - username: rabbitmq-admin - password: ${RABBITMQ_ADMIN_PASSWORD} - keystone: - username: keystone-rabbitmq-user - password: ${KEYSTONE_RABBITMQ_USER_PASSWORD} - statefulset: - replicas: 2 - name: osh-rabbitmq-rabbitmq - 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: keystone - reference: master - dependencies: - - helm-toolkit ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: radosgw-openstack -data: - chart_name: radosgw-openstack - release: radosgw-openstack - namespace: openstack - wait: - timeout: 1800 - labels: - release_group: osh-radosgw-openstack - test: - enabled: true - timeout: 600 - install: - no_hooks: False - upgrade: - no_hooks: False - pre: - delete: - - type: job - labels: - release_group: osh-radosgw-openstack - values: - release_uuid: ${RELEASE_UUID} - endpoints: - identity: - namespace: openstack - auth: - admin: - password: ${KEYSTONE_ADMIN_PASSWORD} - swift: - password: ${SWIFT_USER_PASSWORD} - object_store: - namespace: openstack - ceph_mon: - namespace: ceph - object_store: - namespace: openstack - ceph_mon: - namespace: ceph - labels: - job: - node_selector_key: openstack-control-plane - node_selector_value: enabled - bootstrap: - enabled: False - conf: - rgw_ks: - 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 - 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: glance -data: - chart_name: glance - release: glance - namespace: openstack - wait: - timeout: 1800 - labels: - release_group: osh-glance - resources: - - type: deployment - - type: job - native: - enabled: false - test: - enabled: true - timeout: 600 - install: - no_hooks: False - upgrade: - no_hooks: False - pre: - delete: - - type: job - labels: - release_group: osh-glance - - type: pod - labels: - release_group: osh-glance - component: test - values: - release_uuid: ${RELEASE_UUID} - endpoints: - identity: - auth: - admin: - password: ${KEYSTONE_ADMIN_PASSWORD} - glance: - password: ${GLANCE_USER_PASSWORD} - test: - password: ${GLANCE_TEST_USER_PASSWORD} - oslo_db: - auth: - admin: - password: ${OSH_MARIADB_ADMIN_PASSWORD} - glance: - password: ${GLANCE_DB_PASSWORD} - oslo_cache: - auth: - memcache_secret_key: ${KEYSTONE_AUTHTOKEN_MEMCACHED_SECRET_KEY} - oslo_messaging: - auth: - admin: - username: rabbitmq-admin - password: ${RABBITMQ_ADMIN_PASSWORD} - glance: - username: glance-rabbitmq-user - password: ${GLANCE_RABBITMQ_USER_PASSWORD} - statefulset: - replicas: 2 - name: osh-rabbitmq-rabbitmq - labels: - api: - node_selector_key: openstack-control-plane - node_selector_value: enabled - job: - node_selector_key: openstack-control-plane - node_selector_value: enabled - registry: - node_selector_key: openstack-control-plane - node_selector_value: enabled - pod: - replicas: - api: 2 - registry: 2 - # NOTE(portdirect): glance APIv1 is required for heat in Newton - conf: - glance: - DEFAULT: - enable_v1_api: true - source: - type: local - location: ${OSH_PATH} - subpath: glance - reference: master - dependencies: - - helm-toolkit ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: cinder -data: - chart_name: cinder - release: cinder - namespace: openstack - wait: - timeout: 1800 - labels: - release_group: osh-cinder - resources: - - type: deployment - - type: job - native: - enabled: false - test: - enabled: true - timeout: 600 - install: - no_hooks: False - upgrade: - no_hooks: False - pre: - delete: - - type: job - labels: - release_group: osh-cinder - - type: pod - labels: - release_group: osh-cinder - component: test - values: - release_uuid: ${RELEASE_UUID} - endpoints: - identity: - auth: - admin: - password: ${KEYSTONE_ADMIN_PASSWORD} - cinder: - password: ${CINDER_USER_PASSWORD} - test: - password: ${CINDER_TEST_USER_PASSWORD} - oslo_db: - auth: - admin: - password: ${OSH_MARIADB_ADMIN_PASSWORD} - cinder: - password: ${CINDER_DB_PASSWORD} - oslo_cache: - auth: - memcache_secret_key: ${KEYSTONE_AUTHTOKEN_MEMCACHED_SECRET_KEY} - oslo_messaging: - auth: - admin: - username: rabbitmq-admin - password: ${RABBITMQ_ADMIN_PASSWORD} - cinder: - username: cinder-rabbitmq-user - password: ${CINDER_RABBITMQ_USER_PASSWORD} - statefulset: - replicas: 2 - name: osh-rabbitmq-rabbitmq - labels: - api: - node_selector_key: openstack-control-plane - node_selector_value: enabled - backup: - node_selector_key: openstack-control-plane - node_selector_value: enabled - job: - node_selector_key: openstack-control-plane - node_selector_value: enabled - scheduler: - node_selector_key: openstack-control-plane - node_selector_value: enabled - volume: - node_selector_key: openstack-control-plane - node_selector_value: enabled - pod: - replicas: - api: 2 - volume: 1 - scheduler: 1 - backup: 1 - conf: - cinder: - DEFAULT: - backup_driver: cinder.backup.drivers.swift - source: - type: local - location: ${OSH_PATH} - subpath: cinder - reference: master - dependencies: - - helm-toolkit ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: openvswitch -data: - chart_name: openvswitch - release: openvswitch - namespace: openstack - wait: - timeout: 1800 - labels: - release_group: osh-openvswitch - resources: - - type: daemonset - min_ready: 1 - native: - enabled: false - install: - no_hooks: False - upgrade: - no_hooks: False - pre: - delete: - - type: job - labels: - release_group: osh-openvswitch - values: - release_uuid: ${RELEASE_UUID} - labels: - ovs: - node_selector_key: openvswitch - node_selector_value: enabled - source: - type: local - location: ${OSH_INFRA_PATH} - subpath: openvswitch - reference: master - dependencies: - - helm-toolkit ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: libvirt -data: - chart_name: libvirt - release: libvirt - namespace: openstack - wait: - timeout: 1800 - labels: - release_group: osh-libvirt - resources: - - type: daemonset - native: - enabled: false - install: - no_hooks: False - upgrade: - no_hooks: False - values: - release_uuid: ${RELEASE_UUID} - labels: - agent: - libvirt: - node_selector_key: openstack-compute-node - node_selector_value: enabled - source: - type: local - location: ${OSH_INFRA_PATH} - subpath: libvirt - reference: master - dependencies: - - helm-toolkit ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: nova -data: - chart_name: nova - release: nova - namespace: openstack - wait: - timeout: 1800 - labels: - release_group: osh-nova - resources: - - type: deployment - - type: daemonset - - type: job - native: - enabled: false - test: - enabled: true - timeout: 900 - install: - no_hooks: False - upgrade: - no_hooks: False - pre: - delete: - - type: job - labels: - application: nova - component: db-init - - type: job - labels: - application: nova - component: db-sync - - type: job - labels: - application: nova - component: ks-user - - type: job - labels: - application: nova - component: ks-service - - type: job - labels: - application: nova - component: ks-endpoints - - type: job - labels: - application: placement - component: ks-user - - type: job - labels: - application: placement - component: ks-service - - type: job - labels: - application: placement - component: ks-endpoints - - type: job - labels: - application: nova - component: cell-setup - values: - release_uuid: ${RELEASE_UUID} - endpoints: - identity: - name: keystone - auth: - admin: - password: ${KEYSTONE_ADMIN_PASSWORD} - nova: - password: ${NOVA_USER_PASSWORD} - neutron: - password: ${NEUTRON_USER_PASSWORD} - placement: - password: ${NOVA_PLACEMENT_USER_PASSWORD} - test: - password: ${NOVA_TEST_USER_PASSWORD} - oslo_db: - auth: - admin: - password: ${OSH_MARIADB_ADMIN_PASSWORD} - nova: - password: ${NOVA_DB_PASSWORD} - oslo_db_api: - auth: - admin: - password: ${OSH_MARIADB_ADMIN_PASSWORD} - nova: - password: ${NOVA_DB_PASSWORD} - oslo_db_cell0: - auth: - admin: - password: ${OSH_MARIADB_ADMIN_PASSWORD} - nova: - password: ${NOVA_DB_PASSWORD} - oslo_cache: - auth: - memcache_secret_key: ${KEYSTONE_AUTHTOKEN_MEMCACHED_SECRET_KEY} - oslo_messaging: - auth: - admin: - username: rabbitmq-admin - password: ${RABBITMQ_ADMIN_PASSWORD} - nova: - username: nova-rabbitmq-user - password: ${NOVA_RABBITMQ_USER_PASSWORD} - statefulset: - replicas: 2 - name: osh-rabbitmq-rabbitmq - labels: - agent: - compute: - node_selector_key: openstack-compute-node - node_selector_value: enabled - compute_ironic: - node_selector_key: openstack-compute-node - node_selector_value: enabled - api_metadata: - node_selector_key: openstack-control-plane - node_selector_value: enabled - conductor: - node_selector_key: openstack-control-plane - node_selector_value: enabled - consoleauth: - node_selector_key: openstack-control-plane - node_selector_value: enabled - job: - node_selector_key: openstack-control-plane - node_selector_value: enabled - novncproxy: - node_selector_key: openstack-control-plane - node_selector_value: enabled - osapi: - node_selector_key: openstack-control-plane - node_selector_value: enabled - placement: - node_selector_key: openstack-control-plane - node_selector_value: enabled - scheduler: - node_selector_key: openstack-control-plane - node_selector_value: enabled - spiceproxy: - node_selector_key: openstack-control-plane - node_selector_value: enabled - test: - node_selector_key: openstack-control-plane - node_selector_value: enabled - pod: - replicas: - api_metadata: 1 - placement: 2 - osapi: 2 - conductor: 2 - consoleauth: 2 - scheduler: 2 - novncproxy: 1 - conf: - nova: - neutron: - metadata_proxy_shared_secret: ${METADATA_PROXY_SHARED_SECRET} - libvirt: - virt_type: qemu - cpu_mode: none - source: - type: local - location: ${OSH_PATH} - subpath: nova - reference: master - dependencies: - - helm-toolkit ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: neutron -data: - chart_name: neutron - release: neutron - namespace: openstack - wait: - timeout: 2400 - labels: - release_group: osh-neutron - resources: - - type: deployment - - type: daemonset - - type: job - native: - enabled: false - test: - enabled: true - timeout: 1200 - install: - no_hooks: False - upgrade: - no_hooks: False - pre: - delete: - - type: job - labels: - application: neutron - component: db-init - - type: job - labels: - application: neutron - component: db-sync - - type: job - labels: - application: neutron - component: ks-user - - type: job - labels: - application: neutron - component: ks-service - - type: job - labels: - application: neutron - component: ks-endpoints - values: - release_uuid: ${RELEASE_UUID} - endpoints: - identity: - auth: - admin: - password: ${KEYSTONE_ADMIN_PASSWORD} - neutron: - password: ${NEUTRON_USER_PASSWORD} - nova: - password: ${NOVA_USER_PASSWORD} - test: - password: ${NEUTRON_TEST_USER_PASSWORD} - oslo_db: - auth: - admin: - password: ${OSH_MARIADB_ADMIN_PASSWORD} - neutron: - password: ${NEUTRON_DB_PASSWORD} - oslo_cache: - auth: - memcache_secret_key: ${KEYSTONE_AUTHTOKEN_MEMCACHED_SECRET_KEY} - oslo_messaging: - auth: - admin: - username: rabbitmq-admin - password: ${RABBITMQ_ADMIN_PASSWORD} - neutron: - username: neutron-rabbitmq-user - password: ${NEUTRON_RABBITMQ_USER_PASSWORD} - statefulset: - replicas: 2 - name: osh-rabbitmq-rabbitmq - pod: - replicas: - server: 2 - labels: - agent: - dhcp: - node_selector_key: openstack-control-plane - node_selector_value: enabled - l3: - node_selector_key: openstack-control-plane - node_selector_value: enabled - metadata: - node_selector_key: openstack-control-plane - node_selector_value: enabled - job: - node_selector_key: openstack-control-plane - node_selector_value: enabled - lb: - node_selector_key: linuxbridge - node_selector_value: enabled - # ovs is a special case, requiring a special - # label that can apply to both control hosts - # and compute hosts, until we get more sophisticated - # with our daemonset scheduling - ovs: - node_selector_key: openvswitch - node_selector_value: enabled - server: - node_selector_key: openstack-control-plane - node_selector_value: enabled - test: - node_selector_key: openstack-control-plane - node_selector_value: enabled - network: - interface: - tunnel: ${TUNNEL_DEVICE} - conf: - neutron: - DEFAULT: - l3_ha: True - max_l3_agents_per_router: 1 - l3_ha_network_type: vxlan - dhcp_agents_per_network: 1 - metadata_agent: - DEFAULT: - metadata_proxy_shared_secret: ${METADATA_PROXY_SHARED_SECRET} - plugins: - ml2_conf: - ml2_type_flat: - flat_networks: public - openvswitch_agent: - agent: - tunnel_types: vxlan - ovs: - bridge_mappings: public:br-ex - source: - type: local - location: ${OSH_PATH} - subpath: neutron - reference: master - dependencies: - - helm-toolkit ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: heat -data: - chart_name: heat - release: heat - namespace: openstack - wait: - timeout: 2400 - labels: - release_group: osh-heat - resources: - - type: deployment - - type: job - native: - enabled: false - test: - enabled: true - timeout: 1200 - install: - no_hooks: False - upgrade: - no_hooks: False - pre: - delete: - - type: job - labels: - release_group: osh-heat - - type: pod - labels: - release_group: osh-heat - component: test - values: - release_uuid: ${RELEASE_UUID} - endpoints: - identity: - auth: - admin: - password: ${KEYSTONE_ADMIN_PASSWORD} - heat: - password: ${HEAT_USER_PASSWORD} - heat_trustee: - password: ${HEAT_TRUSTEE_PASSWORD} - heat_stack_user: - password: ${HEAT_STACK_PASSWORD} - test: - password: ${HEAT_TEST_USER_PASSWORD} - oslo_db: - auth: - admin: - password: ${OSH_MARIADB_ADMIN_PASSWORD} - heat: - password: ${HEAT_DB_PASSWORD} - oslo_cache: - hosts: - default: heat-memcached - oslo_messaging: - auth: - admin: - username: rabbitmq-admin - password: ${RABBITMQ_ADMIN_PASSWORD} - heat: - username: heat-rabbitmq-user - password: ${HEAT_RABBITMQ_USER_PASSWORD} - statefulset: - replicas: 2 - name: osh-rabbitmq-rabbitmq - labels: - api: - node_selector_key: openstack-control-plane - node_selector_value: enabled - cfn: - node_selector_key: openstack-control-plane - node_selector_value: enabled - cloudwatch: - node_selector_key: openstack-control-plane - node_selector_value: enabled - engine: - 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 - cfn: 2 - cloudwatch: 2 - engine: 2 - source: - type: local - location: ${OSH_PATH} - subpath: heat - reference: master - dependencies: - - helm-toolkit ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: prometheus-openstack-exporter -data: - chart_name: prometheus-openstack-exporter - release: prometheus-openstack-exporter - namespace: openstack - wait: - timeout: 1800 - labels: - release_group: osh-prometheus-openstack-exporter - install: - no_hooks: False - upgrade: - no_hooks: False - pre: - delete: - - type: job - labels: - release_group: osh-prometheus-openstack-exporter - values: - release_uuid: ${RELEASE_UUID} - endpoints: - identity: - auth: - admin: - password: ${KEYSTONE_ADMIN_PASSWORD} - user: - password: ${OPENSTACK_EXPORTER_USER_PASSWORD} - labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled - source: - type: local - location: ${OSH_INFRA_PATH} - subpath: prometheus-openstack-exporter - reference: master - dependencies: - - helm-toolkit ---- -schema: armada/ChartGroup/v1 -metadata: - schema: metadata/Document/v1 - name: openstack-ingress-controller -data: - description: "OpenStack Ingress Controller" - sequenced: False - chart_group: - - openstack-ingress-controller ---- -schema: armada/ChartGroup/v1 -metadata: - schema: metadata/Document/v1 - name: openstack-ceph-config -data: - description: "OpenStack Ceph Config" - sequenced: True - chart_group: - - openstack-ceph-config ---- -schema: armada/ChartGroup/v1 -metadata: - schema: metadata/Document/v1 - name: deploy-mariadb -data: - description: "Mariadb" - sequenced: True - chart_group: - - mariadb ---- -schema: armada/ChartGroup/v1 -metadata: - schema: metadata/Document/v1 - name: deploy-memcached -data: - description: "Memcached" - sequenced: True - chart_group: - - memcached ---- -schema: armada/ChartGroup/v1 -metadata: - schema: metadata/Document/v1 - name: deploy-rabbitmq -data: - description: "RabbitMQ" - sequenced: True - chart_group: - - rabbitmq ---- -schema: armada/ChartGroup/v1 -metadata: - schema: metadata/Document/v1 - name: openstack-keystone -data: - description: "Deploy keystone" - sequenced: True - chart_group: - - keystone ---- -schema: armada/ChartGroup/v1 -metadata: - schema: metadata/Document/v1 - name: openstack-glance -data: - description: "Deploy glance" - sequenced: True - chart_group: - - glance ---- -schema: armada/ChartGroup/v1 -metadata: - schema: metadata/Document/v1 - name: openstack-radosgw -data: - description: "Deploy rados gateway" - sequenced: False - chart_group: - - radosgw-openstack ---- -schema: armada/ChartGroup/v1 -metadata: - schema: metadata/Document/v1 - name: openstack-cinder -data: - description: "Deploy cinder" - sequenced: True - chart_group: - - cinder ---- -schema: armada/ChartGroup/v1 -metadata: - schema: metadata/Document/v1 - name: openstack-compute-kit -data: - description: "Deploy nova and neutron, as well as supporting services" - sequenced: False - chart_group: - - libvirt - - openvswitch - - nova - - neutron ---- -schema: armada/ChartGroup/v1 -metadata: - schema: metadata/Document/v1 - name: openstack-heat -data: - description: "Deploy heat" - sequenced: True - chart_group: - - heat ---- -schema: armada/ChartGroup/v1 -metadata: - schema: metadata/Document/v1 - name: prometheus-openstack-exporter -data: - description: 'Deploy Prometheus OpenStack exporter' - sequenced: False - chart_group: - - prometheus-openstack-exporter ---- -schema: armada/Manifest/v1 -metadata: - schema: metadata/Document/v1 - name: armada-manifest -data: - release_prefix: osh - chart_groups: - - openstack-ingress-controller - - openstack-ceph-config - - deploy-mariadb - - deploy-memcached - - deploy-rabbitmq - - openstack-keystone - - openstack-radosgw - - openstack-glance - - openstack-cinder - - openstack-compute-kit - - openstack-heat - - prometheus-openstack-exporter diff --git a/tools/gate/playbooks/gather-armada-manifests.yaml b/tools/gate/playbooks/gather-armada-manifests.yaml deleted file mode 100644 index a4da80c10a..0000000000 --- a/tools/gate/playbooks/gather-armada-manifests.yaml +++ /dev/null @@ -1,43 +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-osh - - updated-armada-cluster-ingress - - updated-armada-ceph - - updated-armada-lma - - updated-armada-osh - - updated-password-armada-osh - 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/zuul.d/jobs-openstack-helm.yaml b/zuul.d/jobs-openstack-helm.yaml index bdc4948f2a..c1b041f22f 100644 --- a/zuul.d/jobs-openstack-helm.yaml +++ b/zuul.d/jobs-openstack-helm.yaml @@ -232,6 +232,44 @@ - ./tools/deployment/component/keystone/keystone.sh - ./tools/deployment/component/horizon/horizon.sh +- job: + timeout: 10800 + name: openstack-helm-multinode-compute-kit-ussuri-ubuntu_bionic + parent: openstack-helm-chart-deploy + nodeset: openstack-helm-five-node-ubuntu + vars: + zuul_osh_infra_relative_path: ../openstack-helm-infra/ + osh_params: + openstack_release: ussuri + container_distro_name: ubuntu + container_distro_version: bionic + pre-run: + - tools/gate/playbooks/multinode-base.yaml + - tools/gate/playbooks/osh-infra-upgrade-host.yaml + - tools/gate/playbooks/osh-infra-deploy-docker.yaml + - tools/gate/playbooks/osh-infra-build.yaml + - tools/gate/playbooks/osh-infra-deploy-k8s.yaml + run: tools/gate/playbooks/multinode-deploy-compute-kit.yaml + +- job: + timeout: 9600 + name: openstack-helm-multinode-cinder-ussuri-ubuntu_bionic + parent: openstack-helm-chart-deploy + nodeset: openstack-helm-five-node-ubuntu + vars: + zuul_osh_infra_relative_path: ../openstack-helm-infra/ + osh_params: + openstack_release: ussuri + container_distro_name: ubuntu + container_distro_version: bionic + pre-run: + - tools/gate/playbooks/multinode-base.yaml + - tools/gate/playbooks/osh-infra-upgrade-host.yaml + - tools/gate/playbooks/osh-infra-deploy-docker.yaml + - tools/gate/playbooks/osh-infra-build.yaml + - tools/gate/playbooks/osh-infra-deploy-k8s.yaml + run: tools/gate/playbooks/multinode-deploy-cinder.yaml + - job: name: openstack-helm-tls parent: openstack-helm-chart-deploy @@ -326,72 +364,6 @@ - ./tools/deployment/component/keystone/keystone.sh - ./tools/deployment/component/cinder/cinder.sh -- job: - name: openstack-helm-netpol-compute-kit-train - parent: openstack-helm-chart-deploy - timeout: 7200 - vars: - osh_params: - openstack_release: train - container_distro_name: ubuntu - container_distro_version: bionic - feature_gates: netpol - gate_scripts_relative_path: ../openstack-helm - gate_scripts: - - ./tools/deployment/common/install-packages.sh - - ./tools/deployment/common/deploy-k8s.sh - - ./tools/deployment/common/setup-client.sh - - ./tools/deployment/component/common/ingress.sh - - ./tools/deployment/common/lockdown-netpol.sh - - ./tools/deployment/component/common/mariadb.sh - - ./tools/deployment/component/common/memcached.sh - - ./tools/deployment/component/common/rabbitmq.sh - - ./tools/deployment/component/nfs-provisioner/nfs-provisioner.sh - - ./tools/deployment/component/keystone/keystone.sh - - ./tools/deployment/component/heat/heat.sh - - ./tools/deployment/component/glance/glance.sh - - ./tools/deployment/component/compute-kit/openvswitch.sh - - ./tools/deployment/component/compute-kit/libvirt.sh - - ./tools/deployment/component/compute-kit/compute-kit.sh - - ./tools/deployment/developer/common/170-setup-gateway.sh - - ./tools/deployment/component/horizon/horizon.sh - - ./tools/deployment/common/openstack-exporter.sh - - ./tools/deployment/developer/common/900-use-it.sh - - ./tools/deployment/common/test-networkpolicy.sh - -- job: - name: openstack-helm-netpol-compute-kit-ussuri - parent: openstack-helm-chart-deploy - timeout: 7200 - vars: - osh_params: - openstack_release: ussuri - container_distro_name: ubuntu - container_distro_version: bionic - feature_gates: netpol - gate_scripts_relative_path: ../openstack-helm - gate_scripts: - - ./tools/deployment/common/install-packages.sh - - ./tools/deployment/common/deploy-k8s.sh - - ./tools/deployment/common/setup-client.sh - - ./tools/deployment/component/common/ingress.sh - - ./tools/deployment/common/lockdown-netpol.sh - - ./tools/deployment/component/common/mariadb.sh - - ./tools/deployment/component/common/memcached.sh - - ./tools/deployment/component/common/rabbitmq.sh - - ./tools/deployment/component/nfs-provisioner/nfs-provisioner.sh - - ./tools/deployment/component/keystone/keystone.sh - - ./tools/deployment/component/heat/heat.sh - - ./tools/deployment/component/glance/glance.sh - - ./tools/deployment/component/compute-kit/openvswitch.sh - - ./tools/deployment/component/compute-kit/libvirt.sh - - ./tools/deployment/component/compute-kit/compute-kit.sh - - ./tools/deployment/developer/common/170-setup-gateway.sh - - ./tools/deployment/component/horizon/horizon.sh - - ./tools/deployment/common/openstack-exporter.sh - - ./tools/deployment/developer/common/900-use-it.sh - - ./tools/deployment/common/test-networkpolicy.sh - - job: name: openstack-helm-tungsten-fabric-train parent: openstack-helm-compute-kit @@ -463,13 +435,14 @@ - ./tools/deployment/component/compute-kit/libvirt.sh - ./tools/deployment/component/compute-kit/compute-kit.sh - ./tools/deployment/component/compute-kit/tungsten-fabric.sh deploy + - job: name: openstack-helm-netpol-compute-kit parent: openstack-helm-chart-deploy timeout: 7200 vars: osh_params: - openstack_release: train + openstack_release: ussuri container_distro_name: ubuntu container_distro_version: bionic feature_gates: netpol @@ -502,7 +475,7 @@ timeout: 7200 vars: osh_params: - openstack_release: train + openstack_release: ussuri container_distro_name: ubuntu container_distro_version: bionic feature_gates: netpol @@ -523,171 +496,3 @@ - ./tools/deployment/component/horizon/horizon.sh - ./tools/deployment/common/openstack-exporter.sh - ./tools/deployment/common/test-networkpolicy.sh - -- job: - name: openstack-helm-multinode-temp - parent: openstack-helm-infra-functional - roles: - - zuul: openstack/openstack-helm-infra - vars: - osh_openstack_release: train - zuul_osh_infra_relative_path: ../openstack-helm-infra/ - timeout: 7200 - pre-run: - - tools/gate/playbooks/osh-infra-upgrade-host.yaml - - tools/gate/playbooks/osh-infra-deploy-docker.yaml - - tools/gate/playbooks/osh-infra-build.yaml - - tools/gate/playbooks/osh-infra-deploy-k8s.yaml - run: tools/gate/playbooks/multinode-deploy.yaml - post-run: tools/gate/playbooks/osh-infra-collect-logs.yaml - required-projects: - - openstack/openstack-helm-infra - -- job: - timeout: 9600 - name: openstack-helm-armada-deploy - parent: openstack-helm-infra-functional - nodeset: openstack-helm-five-node-ubuntu - roles: - - zuul: openstack/openstack-helm-infra - pre-run: - - tools/gate/playbooks/osh-infra-upgrade-host.yaml - - tools/gate/playbooks/osh-infra-deploy-docker.yaml - - tools/gate/playbooks/osh-infra-build.yaml - - tools/gate/playbooks/osh-infra-deploy-k8s.yaml - post-run: - - tools/gate/playbooks/osh-infra-collect-logs.yaml - - tools/gate/playbooks/gather-armada-manifests.yaml - required-projects: - - openstack/openstack-helm-infra - vars: - zuul_osh_infra_relative_path: ../openstack-helm-infra/ - gate_scripts_relative_path: ../openstack-helm - 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: - timeout: 9600 - name: openstack-helm-armada-update-uuid - parent: openstack-helm-infra-functional - nodeset: openstack-helm-five-node-ubuntu - roles: - - zuul: openstack/openstack-helm-infra - pre-run: - - tools/gate/playbooks/osh-infra-upgrade-host.yaml - - tools/gate/playbooks/osh-infra-deploy-docker.yaml - - tools/gate/playbooks/osh-infra-build.yaml - - tools/gate/playbooks/osh-infra-deploy-k8s.yaml - post-run: - - tools/gate/playbooks/osh-infra-collect-logs.yaml - - tools/gate/playbooks/gather-armada-manifests.yaml - required-projects: - - openstack/openstack-helm-infra - vars: - zuul_osh_infra_relative_path: ../openstack-helm-infra/ - gate_scripts_relative_path: ../openstack-helm - 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-uuid.sh - -- job: - timeout: 10800 - name: openstack-helm-armada-update-passwords - parent: openstack-helm-infra-functional - nodeset: openstack-helm-five-node-ubuntu - roles: - - zuul: openstack/openstack-helm-infra - pre-run: - - tools/gate/playbooks/osh-infra-upgrade-host.yaml - - tools/gate/playbooks/osh-infra-deploy-docker.yaml - - tools/gate/playbooks/osh-infra-build.yaml - - tools/gate/playbooks/osh-infra-deploy-k8s.yaml - post-run: - - tools/gate/playbooks/osh-infra-collect-logs.yaml - - tools/gate/playbooks/gather-armada-manifests.yaml - required-projects: - - openstack/openstack-helm-infra - vars: - zuul_osh_infra_relative_path: ../openstack-helm-infra/ - gate_scripts_relative_path: ../openstack-helm - 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-multinode-temp-ubuntu - parent: openstack-helm-multinode-temp - nodeset: openstack-helm-five-node-ubuntu - -- job: - name: openstack-helm-multinode-temp-centos - parent: openstack-helm-multinode-temp - nodeset: openstack-helm-five-node-centos - -- job: - name: openstack-helm-multinode-temp-fedora - parent: openstack-helm-multinode-temp - nodeset: openstack-helm-five-node-fedora - -- job: - name: openstack-helm-ironic-ubuntu - parent: openstack-helm-multinode-temp - nodeset: openstack-helm-ubuntu - run: tools/gate/playbooks/ironic-deploy.yaml - -- job: - timeout: 10800 - name: openstack-helm-multinode-temp-tempest - parent: openstack-helm-multinode-temp - nodeset: openstack-helm-five-node-ubuntu - run: tools/gate/playbooks/multinode-tempest-deploy.yaml - -- job: - timeout: 10800 - name: openstack-helm-multinode-compute-kit-train-ubuntu_bionic - parent: openstack-helm-chart-deploy - nodeset: openstack-helm-five-node-ubuntu - vars: - zuul_osh_infra_relative_path: ../openstack-helm-infra/ - osh_params: - openstack_release: train - container_distro_name: ubuntu - container_distro_version: bionic - pre-run: - - tools/gate/playbooks/multinode-base.yaml - - tools/gate/playbooks/osh-infra-upgrade-host.yaml - - tools/gate/playbooks/osh-infra-deploy-docker.yaml - - tools/gate/playbooks/osh-infra-build.yaml - - tools/gate/playbooks/osh-infra-deploy-k8s.yaml - run: tools/gate/playbooks/multinode-deploy-compute-kit.yaml - -- job: - timeout: 9600 - name: openstack-helm-multinode-cinder-train-ubuntu_bionic - parent: openstack-helm-chart-deploy - nodeset: openstack-helm-five-node-ubuntu - vars: - zuul_osh_infra_relative_path: ../openstack-helm-infra/ - osh_params: - openstack_release: train - container_distro_name: ubuntu - container_distro_version: bionic - pre-run: - - tools/gate/playbooks/multinode-base.yaml - - tools/gate/playbooks/osh-infra-upgrade-host.yaml - - tools/gate/playbooks/osh-infra-deploy-docker.yaml - - tools/gate/playbooks/osh-infra-build.yaml - - tools/gate/playbooks/osh-infra-deploy-k8s.yaml - run: tools/gate/playbooks/multinode-deploy-cinder.yaml diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 5701670f5b..e1d7a4ed1e 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -13,11 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -# For having the full context, this file should be read -# with the openstack-helm-infra repository, where nodesets -# and jobs are defined. -# NOTE(evrardjp): Some jobs and playbooks haven't been -# migrated to openstack-helm-infra yet. +# Full context: this file should be used with the openstack-helm-infra +# repository, where nodesets and jobs are defined. - project: templates: - publish-openstack-docs-pti @@ -57,21 +54,6 @@ experimental: jobs: - openstack-helm-apparmor - - openstack-helm-tls - openstack-helm-apparmor-cinder - openstack-helm-netpol-compute-kit - - openstack-helm-netpol-compute-kit-train - - openstack-helm-netpol-compute-kit-ussuri - openstack-helm-netpol-cinder - - openstack-helm-multinode-compute-kit-train-ubuntu_bionic - - openstack-helm-multinode-cinder-train-ubuntu_bionic - # NOTE(srwilkers): Disabling the following jobs until - # issues with the kubeadm-aio based deployments are addressed - # - openstack-helm-multinode-temp-ubuntu - # - openstack-helm-multinode-temp-centos - # - openstack-helm-multinode-temp-fedora - # - openstack-helm-multinode-temp-tempest - # - openstack-helm-armada-deploy - # - openstack-helm-armada-update-uuid - # - openstack-helm-armada-update-passwords - # - openstack-helm-ironic-ubuntu