From 52cd767c84ba482e4d56f137df47b0aceaf39391 Mon Sep 17 00:00:00 2001 From: Vladimir Kozhukalov Date: Tue, 24 Oct 2023 17:10:19 -0500 Subject: [PATCH] Cleanup unnecessary files We recently re-worked all the deployment jobs so they use `deploy-env` Ansible role which works for both multi-node and single-node environments. This means there is no need to have diffrent sets of scripts for these two cases. Also when we deploy Openstack components it is better to have values overrides for different scenarios but not different sets of scripts. Here we remove unused deployment scripts which in many cases duplicated the code base. We will be cleaning up the code base even further to provide excelent user experience. Change-Id: Iacda03964a4dd0e60873593df9f590ce20504f2f --- ironic/Chart.yaml | 2 +- .../values_overrides/standalone.yaml | 0 neutron/Chart.yaml | 2 +- .../values_overrides}/bagpipe_bgp.yaml | 0 .../values_overrides}/l2gateway.yaml | 0 releasenotes/notes/ironic.yaml | 1 + releasenotes/notes/neutron.yaml | 1 + tools/deployment/apparmor/015-ingress.sh | 67 ------ .../baremetal/000-install-packages.sh | 1 - tools/deployment/baremetal/005-setup-nodes.sh | 2 +- tools/deployment/baremetal/030-ceph.sh | 2 +- .../baremetal/035-ceph-ns-activate.sh | 2 +- tools/deployment/baremetal/040-mariadb.sh | 2 +- tools/deployment/baremetal/050-rabbitmq.sh | 2 +- tools/deployment/baremetal/070-keystone.sh | 2 +- .../baremetal/080-ceph-radosgateway.sh | 1 - tools/deployment/baremetal/090-glance.sh | 2 +- tools/deployment/baremetal/100-heat.sh | 2 +- tools/deployment/baremetal/900-use-it.sh | 2 +- .../baremetal}/fake-baremetal-1.xml | 0 .../baremetal}/heat-basic-bm-deployment.yaml | 0 .../tls => deployment/common}/cert-manager.sh | 0 .../910-clean-it.sh => common/clean-it.sh} | 0 tools/deployment/common/deploy-k8s-kubeadm.sh | 21 -- tools/deployment/common/deploy-k8s.sh | 21 -- .../common}/heat-basic-vm-deployment.yaml | 0 .../common}/heat-public-net-deployment.yaml | 0 .../common}/heat-subnet-pool-deployment.yaml | 0 .../common}/heat-vm-volume-attach.yaml | 0 tools/deployment/common/install-packages.sh | 30 --- tools/{ => deployment/common}/pull-images.sh | 0 .../common}/rally-reports.yaml | 0 .../setup-gateway.sh} | 0 .../common/900-use-it.sh => common/use-it.sh} | 8 +- ...-changes-do-not-update-other-components.sh | 0 ...lidate-umbrella-upgrade-no-side-effects.sh | 0 .../250-aodh.sh => component/aodh/aodh.sh} | 0 .../ceilometer/ceilometer.sh} | 0 .../compute-kit}/compute-kit-sr-iov.sh | 0 .../magnum/magnum.sh} | 0 .../mistral/mistral.sh} | 0 .../180-create-resource-for-octavia.sh | 0 .../octavia}/190-create-octavia-certs.sh | 0 .../octavia}/200-octavia.sh | 0 .../ovn/120-openvswitch.sh | 0 .../{developer => component}/ovn/125-ovn.sh | 0 .../ovn/140-compute-kit.sh | 0 .../senlin/senlin.sh} | 0 .../developer/ceph/000-install-packages.sh | 1 - .../developer/ceph/010-deploy-k8s.sh | 1 - .../developer/ceph/011-deploy-k8s-kubeadm.sh | 1 - .../developer/ceph/020-setup-client.sh | 1 - .../deployment/developer/ceph/030-ingress.sh | 1 - tools/deployment/developer/ceph/040-ceph.sh | 1 - .../developer/ceph/045-ceph-ns-activate.sh | 54 ----- .../deployment/developer/ceph/050-mariadb.sh | 1 - .../deployment/developer/ceph/060-rabbitmq.sh | 1 - .../developer/ceph/070-memcached.sh | 1 - .../deployment/developer/ceph/080-keystone.sh | 1 - tools/deployment/developer/ceph/090-heat.sh | 1 - .../deployment/developer/ceph/100-horizon.sh | 1 - .../developer/ceph/110-ceph-radosgateway.sh | 63 ------ tools/deployment/developer/ceph/120-glance.sh | 38 ---- tools/deployment/developer/ceph/130-cinder.sh | 53 ----- .../developer/ceph/140-openvswitch.sh | 1 - .../deployment/developer/ceph/150-libvirt.sh | 28 --- .../developer/ceph/160-compute-kit.sh | 20 -- .../developer/ceph/170-setup-gateway.sh | 1 - .../ceph/180-create-resource-for-octavia.sh | 1 - .../ceph/190-create-octavia-certs.sh | 1 - .../deployment/developer/ceph/200-octavia.sh | 1 - tools/deployment/developer/ceph/900-use-it.sh | 1 - .../developer/common/000-install-packages.sh | 27 --- .../developer/common/010-deploy-k8s.sh | 22 -- .../developer/common/020-setup-client.sh | 1 - .../developer/common/030-ingress.sh | 1 - .../developer/common/050-mariadb.sh | 33 --- .../developer/common/060-rabbitmq.sh | 32 --- .../developer/common/080-keystone.sh | 36 --- .../developer/common/085-barbican.sh | 36 --- tools/deployment/developer/common/090-heat.sh | 36 --- .../developer/common/100-horizon.sh | 39 ---- .../developer/common/140-openvswitch.sh | 31 --- .../developer/dpdk/000-install-packages.sh | 1 - .../developer/dpdk/010-deploy-k8s.sh | 1 - .../developer/dpdk/020-setup-client.sh | 1 - .../deployment/developer/dpdk/030-ingress.sh | 1 - .../developer/dpdk/040-nfs-provisioner.sh | 1 - .../deployment/developer/dpdk/050-mariadb.sh | 1 - .../deployment/developer/dpdk/060-rabbitmq.sh | 1 - .../developer/dpdk/070-memcached.sh | 1 - .../deployment/developer/dpdk/080-keystone.sh | 1 - tools/deployment/developer/dpdk/090-heat.sh | 1 - .../deployment/developer/dpdk/100-horizon.sh | 1 - tools/deployment/developer/dpdk/120-glance.sh | 1 - .../developer/dpdk/140-openvswitch.sh | 20 -- .../deployment/developer/dpdk/150-libvirt.sh | 1 - .../developer/dpdk/160-compute-kit.sh | 20 -- .../deployment/developer/ldap/080-keystone.sh | 76 ------- .../developer/nfs/000-install-packages.sh | 1 - .../developer/nfs/010-deploy-k8s.sh | 1 - .../developer/nfs/020-setup-client.sh | 1 - tools/deployment/developer/nfs/030-ingress.sh | 1 - .../developer/nfs/040-nfs-provisioner.sh | 30 --- tools/deployment/developer/nfs/050-mariadb.sh | 1 - .../deployment/developer/nfs/060-rabbitmq.sh | 1 - .../deployment/developer/nfs/070-memcached.sh | 1 - .../deployment/developer/nfs/080-keystone.sh | 1 - tools/deployment/developer/nfs/090-heat.sh | 1 - tools/deployment/developer/nfs/100-horizon.sh | 1 - tools/deployment/developer/nfs/120-glance.sh | 43 ---- .../developer/nfs/140-openvswitch.sh | 1 - tools/deployment/developer/nfs/150-libvirt.sh | 29 --- .../developer/nfs/160-compute-kit.sh | 18 -- .../developer/nfs/170-setup-gateway.sh | 1 - .../nfs/180-create-resource-for-octavia.sh | 1 - .../developer/nfs/190-create-octavia-certs.sh | 1 - tools/deployment/developer/nfs/200-octavia.sh | 1 - tools/deployment/developer/nfs/900-use-it.sh | 1 - .../deployment/multinode/010-setup-client.sh | 1 - tools/deployment/multinode/020-ingress.sh | 17 -- tools/deployment/multinode/030-ceph.sh | 100 --------- .../multinode/040-ceph-ns-activate.sh | 48 ---- .../multinode/045-nfs-provisioner.sh | 1 - tools/deployment/multinode/050-mariadb.sh | 42 ---- tools/deployment/multinode/060-rabbitmq.sh | 1 - tools/deployment/multinode/070-memcached.sh | 1 - tools/deployment/multinode/080-keystone.sh | 42 ---- tools/deployment/multinode/085-horizon.sh | 46 ---- .../multinode/090-ceph-radosgateway.sh | 65 ------ tools/deployment/multinode/100-glance.sh | 54 ----- tools/deployment/multinode/1000-tempest.sh | 92 -------- tools/deployment/multinode/110-cinder.sh | 86 ------- tools/deployment/multinode/120-openvswitch.sh | 30 --- tools/deployment/multinode/130-libvirt.sh | 46 ---- tools/deployment/multinode/140-compute-kit.sh | 142 ------------ tools/deployment/multinode/150-heat.sh | 48 ---- tools/deployment/multinode/160-barbican.sh | 39 ---- tools/deployment/multinode/210-postgresql.sh | 29 --- tools/deployment/multinode/220-gnocchi.sh | 34 --- tools/deployment/multinode/230-mongodb.sh | 29 --- .../deployment/multinode/800-setup-gateway.sh | 50 ----- tools/deployment/multinode/900-use-it.sh | 136 ----------- .../deployment/multinode/kube-node-subnet.sh | 49 ---- tools/gate/deploy-k8s.sh | 21 -- tools/gate/files/template-python.sh | 16 -- .../playbooks/buildset_registry_alias.yaml | 20 -- tools/gate/playbooks/helm3-linter.yaml | 40 ---- tools/gate/playbooks/ironic-deploy.yaml | 212 ------------------ tools/gate/playbooks/multinode-base.yaml | 30 --- .../playbooks/multinode-deploy-cinder.yaml | 83 ------- .../multinode-deploy-compute-kit.yaml | 84 ------- .../playbooks/multinode-tempest-deploy.yaml | 112 --------- tools/gate/playbooks/osh-infra-build.yaml | 34 --- .../playbooks/osh-infra-deploy-docker.yaml | 41 ---- .../gate/playbooks/osh-infra-deploy-k8s.yaml | 42 ---- .../playbooks/osh-infra-setup-firewall.yaml | 23 -- .../playbooks/osh-infra-upgrade-host.yaml | 51 ----- tools/gate/playbooks/vars.yaml | 23 -- tools/gate/playbooks/zuul-linter.yaml | 18 -- .../backends/networking/linuxbridge.yaml | 20 -- zuul.d/2023.1.yaml | 4 +- zuul.d/base.yaml | 81 ++----- 163 files changed, 38 insertions(+), 3151 deletions(-) rename tools/overrides/deployment/baremetal/ironic-standalone.yaml => ironic/values_overrides/standalone.yaml (100%) rename {tools/overrides/backends/networking => neutron/values_overrides}/bagpipe_bgp.yaml (100%) rename {tools/overrides/backends/networking => neutron/values_overrides}/l2gateway.yaml (100%) delete mode 100755 tools/deployment/apparmor/015-ingress.sh delete mode 120000 tools/deployment/baremetal/000-install-packages.sh delete mode 120000 tools/deployment/baremetal/080-ceph-radosgateway.sh rename tools/{gate/files => deployment/baremetal}/fake-baremetal-1.xml (100%) rename tools/{gate/files => deployment/baremetal}/heat-basic-bm-deployment.yaml (100%) rename tools/{scripts/tls => deployment/common}/cert-manager.sh (100%) rename tools/deployment/{developer/common/910-clean-it.sh => common/clean-it.sh} (100%) delete mode 100755 tools/deployment/common/deploy-k8s-kubeadm.sh delete mode 100755 tools/deployment/common/deploy-k8s.sh rename tools/{gate/files => deployment/common}/heat-basic-vm-deployment.yaml (100%) rename tools/{gate/files => deployment/common}/heat-public-net-deployment.yaml (100%) rename tools/{gate/files => deployment/common}/heat-subnet-pool-deployment.yaml (100%) rename tools/{gate/files => deployment/common}/heat-vm-volume-attach.yaml (100%) delete mode 100755 tools/deployment/common/install-packages.sh rename tools/{ => deployment/common}/pull-images.sh (100%) rename tools/{gate/files => deployment/common}/rally-reports.yaml (100%) rename tools/deployment/{developer/common/170-setup-gateway.sh => common/setup-gateway.sh} (100%) rename tools/deployment/{developer/common/900-use-it.sh => common/use-it.sh} (95%) rename tools/{gate/tests => deployment/common}/validate-umbrella-upgrade-config-changes-do-not-update-other-components.sh (100%) rename tools/{gate/tests => deployment/common}/validate-umbrella-upgrade-no-side-effects.sh (100%) rename tools/deployment/{multinode/250-aodh.sh => component/aodh/aodh.sh} (100%) rename tools/deployment/{multinode/260-ceilometer.sh => component/ceilometer/ceilometer.sh} (100%) rename tools/{overrides/backends/networking => deployment/component/compute-kit}/compute-kit-sr-iov.sh (100%) rename tools/deployment/{multinode/190-magnum.sh => component/magnum/magnum.sh} (100%) rename tools/deployment/{multinode/180-mistral.sh => component/mistral/mistral.sh} (100%) rename tools/deployment/{developer/common => component/octavia}/180-create-resource-for-octavia.sh (100%) rename tools/deployment/{developer/common => component/octavia}/190-create-octavia-certs.sh (100%) rename tools/deployment/{developer/common => component/octavia}/200-octavia.sh (100%) rename tools/deployment/{developer => component}/ovn/120-openvswitch.sh (100%) rename tools/deployment/{developer => component}/ovn/125-ovn.sh (100%) rename tools/deployment/{developer => component}/ovn/140-compute-kit.sh (100%) rename tools/deployment/{multinode/170-senlin.sh => component/senlin/senlin.sh} (100%) delete mode 120000 tools/deployment/developer/ceph/000-install-packages.sh delete mode 120000 tools/deployment/developer/ceph/010-deploy-k8s.sh delete mode 120000 tools/deployment/developer/ceph/011-deploy-k8s-kubeadm.sh delete mode 120000 tools/deployment/developer/ceph/020-setup-client.sh delete mode 120000 tools/deployment/developer/ceph/030-ingress.sh delete mode 120000 tools/deployment/developer/ceph/040-ceph.sh delete mode 100755 tools/deployment/developer/ceph/045-ceph-ns-activate.sh delete mode 120000 tools/deployment/developer/ceph/050-mariadb.sh delete mode 120000 tools/deployment/developer/ceph/060-rabbitmq.sh delete mode 120000 tools/deployment/developer/ceph/070-memcached.sh delete mode 120000 tools/deployment/developer/ceph/080-keystone.sh delete mode 120000 tools/deployment/developer/ceph/090-heat.sh delete mode 120000 tools/deployment/developer/ceph/100-horizon.sh delete mode 100755 tools/deployment/developer/ceph/110-ceph-radosgateway.sh delete mode 100755 tools/deployment/developer/ceph/120-glance.sh delete mode 100755 tools/deployment/developer/ceph/130-cinder.sh delete mode 120000 tools/deployment/developer/ceph/140-openvswitch.sh delete mode 100755 tools/deployment/developer/ceph/150-libvirt.sh delete mode 100755 tools/deployment/developer/ceph/160-compute-kit.sh delete mode 120000 tools/deployment/developer/ceph/170-setup-gateway.sh delete mode 120000 tools/deployment/developer/ceph/180-create-resource-for-octavia.sh delete mode 120000 tools/deployment/developer/ceph/190-create-octavia-certs.sh delete mode 120000 tools/deployment/developer/ceph/200-octavia.sh delete mode 120000 tools/deployment/developer/ceph/900-use-it.sh delete mode 100755 tools/deployment/developer/common/000-install-packages.sh delete mode 100755 tools/deployment/developer/common/010-deploy-k8s.sh delete mode 120000 tools/deployment/developer/common/020-setup-client.sh delete mode 120000 tools/deployment/developer/common/030-ingress.sh delete mode 100755 tools/deployment/developer/common/050-mariadb.sh delete mode 100755 tools/deployment/developer/common/060-rabbitmq.sh delete mode 100755 tools/deployment/developer/common/080-keystone.sh delete mode 100755 tools/deployment/developer/common/085-barbican.sh delete mode 100755 tools/deployment/developer/common/090-heat.sh delete mode 100755 tools/deployment/developer/common/100-horizon.sh delete mode 100755 tools/deployment/developer/common/140-openvswitch.sh delete mode 120000 tools/deployment/developer/dpdk/000-install-packages.sh delete mode 120000 tools/deployment/developer/dpdk/010-deploy-k8s.sh delete mode 120000 tools/deployment/developer/dpdk/020-setup-client.sh delete mode 120000 tools/deployment/developer/dpdk/030-ingress.sh delete mode 120000 tools/deployment/developer/dpdk/040-nfs-provisioner.sh delete mode 120000 tools/deployment/developer/dpdk/050-mariadb.sh delete mode 120000 tools/deployment/developer/dpdk/060-rabbitmq.sh delete mode 120000 tools/deployment/developer/dpdk/070-memcached.sh delete mode 120000 tools/deployment/developer/dpdk/080-keystone.sh delete mode 120000 tools/deployment/developer/dpdk/090-heat.sh delete mode 120000 tools/deployment/developer/dpdk/100-horizon.sh delete mode 120000 tools/deployment/developer/dpdk/120-glance.sh delete mode 100755 tools/deployment/developer/dpdk/140-openvswitch.sh delete mode 120000 tools/deployment/developer/dpdk/150-libvirt.sh delete mode 100755 tools/deployment/developer/dpdk/160-compute-kit.sh delete mode 100755 tools/deployment/developer/ldap/080-keystone.sh delete mode 120000 tools/deployment/developer/nfs/000-install-packages.sh delete mode 120000 tools/deployment/developer/nfs/010-deploy-k8s.sh delete mode 120000 tools/deployment/developer/nfs/020-setup-client.sh delete mode 120000 tools/deployment/developer/nfs/030-ingress.sh delete mode 100755 tools/deployment/developer/nfs/040-nfs-provisioner.sh delete mode 120000 tools/deployment/developer/nfs/050-mariadb.sh delete mode 120000 tools/deployment/developer/nfs/060-rabbitmq.sh delete mode 120000 tools/deployment/developer/nfs/070-memcached.sh delete mode 120000 tools/deployment/developer/nfs/080-keystone.sh delete mode 120000 tools/deployment/developer/nfs/090-heat.sh delete mode 120000 tools/deployment/developer/nfs/100-horizon.sh delete mode 100755 tools/deployment/developer/nfs/120-glance.sh delete mode 120000 tools/deployment/developer/nfs/140-openvswitch.sh delete mode 100755 tools/deployment/developer/nfs/150-libvirt.sh delete mode 100755 tools/deployment/developer/nfs/160-compute-kit.sh delete mode 120000 tools/deployment/developer/nfs/170-setup-gateway.sh delete mode 120000 tools/deployment/developer/nfs/180-create-resource-for-octavia.sh delete mode 120000 tools/deployment/developer/nfs/190-create-octavia-certs.sh delete mode 120000 tools/deployment/developer/nfs/200-octavia.sh delete mode 120000 tools/deployment/developer/nfs/900-use-it.sh delete mode 120000 tools/deployment/multinode/010-setup-client.sh delete mode 100755 tools/deployment/multinode/020-ingress.sh delete mode 100755 tools/deployment/multinode/030-ceph.sh delete mode 100755 tools/deployment/multinode/040-ceph-ns-activate.sh delete mode 120000 tools/deployment/multinode/045-nfs-provisioner.sh delete mode 100755 tools/deployment/multinode/050-mariadb.sh delete mode 120000 tools/deployment/multinode/060-rabbitmq.sh delete mode 120000 tools/deployment/multinode/070-memcached.sh delete mode 100755 tools/deployment/multinode/080-keystone.sh delete mode 100755 tools/deployment/multinode/085-horizon.sh delete mode 100755 tools/deployment/multinode/090-ceph-radosgateway.sh delete mode 100755 tools/deployment/multinode/100-glance.sh delete mode 100755 tools/deployment/multinode/1000-tempest.sh delete mode 100755 tools/deployment/multinode/110-cinder.sh delete mode 100755 tools/deployment/multinode/120-openvswitch.sh delete mode 100755 tools/deployment/multinode/130-libvirt.sh delete mode 100755 tools/deployment/multinode/140-compute-kit.sh delete mode 100755 tools/deployment/multinode/150-heat.sh delete mode 100755 tools/deployment/multinode/160-barbican.sh delete mode 100755 tools/deployment/multinode/210-postgresql.sh delete mode 100755 tools/deployment/multinode/220-gnocchi.sh delete mode 100755 tools/deployment/multinode/230-mongodb.sh delete mode 100755 tools/deployment/multinode/800-setup-gateway.sh delete mode 100755 tools/deployment/multinode/900-use-it.sh delete mode 100755 tools/deployment/multinode/kube-node-subnet.sh delete mode 100755 tools/gate/deploy-k8s.sh delete mode 100755 tools/gate/files/template-python.sh delete mode 100644 tools/gate/playbooks/buildset_registry_alias.yaml delete mode 100644 tools/gate/playbooks/helm3-linter.yaml delete mode 100644 tools/gate/playbooks/ironic-deploy.yaml delete mode 100644 tools/gate/playbooks/multinode-base.yaml delete mode 100644 tools/gate/playbooks/multinode-deploy-cinder.yaml delete mode 100644 tools/gate/playbooks/multinode-deploy-compute-kit.yaml delete mode 100644 tools/gate/playbooks/multinode-tempest-deploy.yaml delete mode 100644 tools/gate/playbooks/osh-infra-build.yaml delete mode 100644 tools/gate/playbooks/osh-infra-deploy-docker.yaml delete mode 100644 tools/gate/playbooks/osh-infra-deploy-k8s.yaml delete mode 100644 tools/gate/playbooks/osh-infra-setup-firewall.yaml delete mode 100644 tools/gate/playbooks/osh-infra-upgrade-host.yaml delete mode 100644 tools/gate/playbooks/vars.yaml delete mode 100644 tools/gate/playbooks/zuul-linter.yaml delete mode 100644 tools/overrides/backends/networking/linuxbridge.yaml diff --git a/ironic/Chart.yaml b/ironic/Chart.yaml index ca827064fb..9d47796701 100644 --- a/ironic/Chart.yaml +++ b/ironic/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Ironic name: ironic -version: 0.2.9 +version: 0.2.10 home: https://docs.openstack.org/ironic/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Ironic/OpenStack_Project_Ironic_vertical.png sources: diff --git a/tools/overrides/deployment/baremetal/ironic-standalone.yaml b/ironic/values_overrides/standalone.yaml similarity index 100% rename from tools/overrides/deployment/baremetal/ironic-standalone.yaml rename to ironic/values_overrides/standalone.yaml diff --git a/neutron/Chart.yaml b/neutron/Chart.yaml index a9112343cf..3eb3493428 100644 --- a/neutron/Chart.yaml +++ b/neutron/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Neutron name: neutron -version: 0.3.26 +version: 0.3.27 home: https://docs.openstack.org/neutron/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png sources: diff --git a/tools/overrides/backends/networking/bagpipe_bgp.yaml b/neutron/values_overrides/bagpipe_bgp.yaml similarity index 100% rename from tools/overrides/backends/networking/bagpipe_bgp.yaml rename to neutron/values_overrides/bagpipe_bgp.yaml diff --git a/tools/overrides/backends/networking/l2gateway.yaml b/neutron/values_overrides/l2gateway.yaml similarity index 100% rename from tools/overrides/backends/networking/l2gateway.yaml rename to neutron/values_overrides/l2gateway.yaml diff --git a/releasenotes/notes/ironic.yaml b/releasenotes/notes/ironic.yaml index 6543e0afc2..ade40153ee 100644 --- a/releasenotes/notes/ironic.yaml +++ b/releasenotes/notes/ironic.yaml @@ -13,4 +13,5 @@ ironic: - 0.2.7 Use HTTP probe instead of TCP probe - 0.2.8 Add helm3 hook supports to allow things like terraform deploys - 0.2.9 Replace node-role.kubernetes.io/master with control-plane + - 0.2.10 Add standalone overrides ... diff --git a/releasenotes/notes/neutron.yaml b/releasenotes/notes/neutron.yaml index d8e6aa24cc..d12706bb60 100644 --- a/releasenotes/notes/neutron.yaml +++ b/releasenotes/notes/neutron.yaml @@ -68,4 +68,5 @@ neutron: - 0.3.24 Add 2023.2 Ubuntu Jammy overrides - 0.3.25 Fix ovs member support for readiness - 0.3.26 Fix ovs options to allow multiple options + - 0.3.27 Move old overrides from the tools directory ... diff --git a/tools/deployment/apparmor/015-ingress.sh b/tools/deployment/apparmor/015-ingress.sh deleted file mode 100755 index d001b7b6af..0000000000 --- a/tools/deployment/apparmor/015-ingress.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash - -# Copyright 2017 The Openstack-Helm Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -set -xe -export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}" - -#NOTE: Lint and package chart -make -C ${HELM_CHART_ROOT_PATH} ingress - -#NOTE: Deploy command -: ${OSH_EXTRA_HELM_ARGS:=""} -cd ${HELM_CHART_ROOT_PATH} - -export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}" - -: ${OSH_INFRA_EXTRA_HELM_ARGS_KUBE_SYSTEM:="$(./tools/deployment/common/get-values-overrides.sh ingress)"} -: ${OSH_INFRA_EXTRA_HELM_ARGS_OPENSTACK:="$(./tools/deployment/common/get-values-overrides.sh ingress)"} -: ${OSH_INFRA_EXTRA_HELM_ARGS_CEPH:="$(./tools/deployment/common/get-values-overrides.sh ingress)"} - -#NOTE: Deploy global ingress -tee /tmp/ingress-kube-system.yaml << EOF -deployment: - mode: cluster - type: DaemonSet -network: - host_namespace: true -EOF -helm upgrade --install ingress-kube-system ${HELM_CHART_ROOT_PATH}/ingress \ - --namespace=kube-system \ - --values=/tmp/ingress-kube-system.yaml \ - ${OSH_INFRA_EXTRA_HELM_ARGS} \ - ${OSH_INFRA_EXTRA_HELM_ARGS_INGRESS_KUBE_SYSTEM} - -#NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh kube-system - -#NOTE: Deploy namespace ingress -helm upgrade --install ingress-osh-infra ${HELM_CHART_ROOT_PATH}/ingress \ - --namespace=osh-infra \ - --set deployment.cluster.class=nginx-osh-infra \ - ${OSH_INFRA_EXTRA_HELM_ARGS} \ - ${OSH_INFRA_EXTRA_HELM_ARGS_INGRESS_OPENSTACK} - -#NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh osh-infra - -helm upgrade --install ingress-ceph ${HELM_CHART_ROOT_PATH}/ingress \ - --namespace=ceph \ - --set deployment.cluster.class=nginx-ceph \ - ${OSH_INFRA_EXTRA_HELM_ARGS} \ - ${OSH_INFRA_EXTRA_HELM_ARGS_INGRESS_CEPH} - -#NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh ceph diff --git a/tools/deployment/baremetal/000-install-packages.sh b/tools/deployment/baremetal/000-install-packages.sh deleted file mode 120000 index 7574db6375..0000000000 --- a/tools/deployment/baremetal/000-install-packages.sh +++ /dev/null @@ -1 +0,0 @@ -../developer/common/000-install-packages.sh \ No newline at end of file diff --git a/tools/deployment/baremetal/005-setup-nodes.sh b/tools/deployment/baremetal/005-setup-nodes.sh index 70d2fe3e63..8965515e91 100755 --- a/tools/deployment/baremetal/005-setup-nodes.sh +++ b/tools/deployment/baremetal/005-setup-nodes.sh @@ -52,7 +52,7 @@ for LIBVIRT_POD in ${LIBVIRT_PODS}; do kubectl exec -n libvirt "${LIBVIRT_POD}" -- rm -f /var/lib/libvirt/images/vm-1.qcow2 || true kubectl exec -n libvirt "${LIBVIRT_POD}" -- qemu-img create -f qcow2 /var/lib/libvirt/images/vm-1.qcow2 5G kubectl exec -n libvirt "${LIBVIRT_POD}" -- chown -R qemu: /var/lib/libvirt/images/vm-1.qcow2 - VM_DEF="$(sed "s|${TEMPLATE_MAC_ADDR}|${MAC_ADDR}|g" ./tools/gate/files/fake-baremetal-1.xml | base64 -w0)" + VM_DEF="$(sed "s|${TEMPLATE_MAC_ADDR}|${MAC_ADDR}|g" ./tools/deployment/baremetal/fake-baremetal-1.xml | base64 -w0)" kubectl exec -n libvirt "${LIBVIRT_POD}" -- sh -c "echo ${VM_DEF} | base64 -d > /tmp/fake-baremetal-1.xml" kubectl exec -n libvirt "${LIBVIRT_POD}" -- sh -c "virsh undefine fake-baremetal-1 || true" kubectl exec -n libvirt "${LIBVIRT_POD}" -- virsh define /tmp/fake-baremetal-1.xml diff --git a/tools/deployment/baremetal/030-ceph.sh b/tools/deployment/baremetal/030-ceph.sh index 4e486c1189..fd4f416979 120000 --- a/tools/deployment/baremetal/030-ceph.sh +++ b/tools/deployment/baremetal/030-ceph.sh @@ -1 +1 @@ -../developer/ceph/040-ceph.sh \ No newline at end of file +../component/ceph/ceph.sh \ No newline at end of file diff --git a/tools/deployment/baremetal/035-ceph-ns-activate.sh b/tools/deployment/baremetal/035-ceph-ns-activate.sh index bcec597e51..2ec8bc94cb 120000 --- a/tools/deployment/baremetal/035-ceph-ns-activate.sh +++ b/tools/deployment/baremetal/035-ceph-ns-activate.sh @@ -1 +1 @@ -../developer/ceph/045-ceph-ns-activate.sh \ No newline at end of file +../component/ceph/ceph-ns-activate.sh \ No newline at end of file diff --git a/tools/deployment/baremetal/040-mariadb.sh b/tools/deployment/baremetal/040-mariadb.sh index 610a382acc..98a5b4f4a7 120000 --- a/tools/deployment/baremetal/040-mariadb.sh +++ b/tools/deployment/baremetal/040-mariadb.sh @@ -1 +1 @@ -../developer/common/050-mariadb.sh \ No newline at end of file +../component/common/mariadb.sh \ No newline at end of file diff --git a/tools/deployment/baremetal/050-rabbitmq.sh b/tools/deployment/baremetal/050-rabbitmq.sh index c0f0d249e2..83e97c8aa3 120000 --- a/tools/deployment/baremetal/050-rabbitmq.sh +++ b/tools/deployment/baremetal/050-rabbitmq.sh @@ -1 +1 @@ -../developer/common/060-rabbitmq.sh \ No newline at end of file +../component/common/rabbitmq.sh \ No newline at end of file diff --git a/tools/deployment/baremetal/070-keystone.sh b/tools/deployment/baremetal/070-keystone.sh index 8b49a2dbba..8721f87584 120000 --- a/tools/deployment/baremetal/070-keystone.sh +++ b/tools/deployment/baremetal/070-keystone.sh @@ -1 +1 @@ -../developer/common/080-keystone.sh \ No newline at end of file +../component/keystone/keystone.sh \ No newline at end of file diff --git a/tools/deployment/baremetal/080-ceph-radosgateway.sh b/tools/deployment/baremetal/080-ceph-radosgateway.sh deleted file mode 120000 index c7c9affb15..0000000000 --- a/tools/deployment/baremetal/080-ceph-radosgateway.sh +++ /dev/null @@ -1 +0,0 @@ -../developer/ceph/110-ceph-radosgateway.sh \ No newline at end of file diff --git a/tools/deployment/baremetal/090-glance.sh b/tools/deployment/baremetal/090-glance.sh index 61557db6cb..6aed64422c 120000 --- a/tools/deployment/baremetal/090-glance.sh +++ b/tools/deployment/baremetal/090-glance.sh @@ -1 +1 @@ -../developer/ceph/120-glance.sh \ No newline at end of file +../component/glance/glance.sh \ No newline at end of file diff --git a/tools/deployment/baremetal/100-heat.sh b/tools/deployment/baremetal/100-heat.sh index 646c44c3cd..190b36c3cc 120000 --- a/tools/deployment/baremetal/100-heat.sh +++ b/tools/deployment/baremetal/100-heat.sh @@ -1 +1 @@ -../developer/common/090-heat.sh \ No newline at end of file +../component/heat/heat.sh \ No newline at end of file diff --git a/tools/deployment/baremetal/900-use-it.sh b/tools/deployment/baremetal/900-use-it.sh index f63fa6046f..46686d887b 100755 --- a/tools/deployment/baremetal/900-use-it.sh +++ b/tools/deployment/baremetal/900-use-it.sh @@ -25,7 +25,7 @@ chmod 600 ${HOME}/.ssh/osh_key # Deploy heat stack to provision node openstack stack create --wait --timeout 15 \ - -t ./tools/gate/files/heat-basic-bm-deployment.yaml \ + -t ./tools/deployment/baremetal/heat-basic-bm-deployment.yaml \ heat-basic-bm-deployment FLOATING_IP=$(openstack stack output show \ diff --git a/tools/gate/files/fake-baremetal-1.xml b/tools/deployment/baremetal/fake-baremetal-1.xml similarity index 100% rename from tools/gate/files/fake-baremetal-1.xml rename to tools/deployment/baremetal/fake-baremetal-1.xml diff --git a/tools/gate/files/heat-basic-bm-deployment.yaml b/tools/deployment/baremetal/heat-basic-bm-deployment.yaml similarity index 100% rename from tools/gate/files/heat-basic-bm-deployment.yaml rename to tools/deployment/baremetal/heat-basic-bm-deployment.yaml diff --git a/tools/scripts/tls/cert-manager.sh b/tools/deployment/common/cert-manager.sh similarity index 100% rename from tools/scripts/tls/cert-manager.sh rename to tools/deployment/common/cert-manager.sh diff --git a/tools/deployment/developer/common/910-clean-it.sh b/tools/deployment/common/clean-it.sh similarity index 100% rename from tools/deployment/developer/common/910-clean-it.sh rename to tools/deployment/common/clean-it.sh diff --git a/tools/deployment/common/deploy-k8s-kubeadm.sh b/tools/deployment/common/deploy-k8s-kubeadm.sh deleted file mode 100755 index 6f2a06cace..0000000000 --- a/tools/deployment/common/deploy-k8s-kubeadm.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 - -CURRENT_DIR="$(pwd)" -: ${OSH_INFRA_PATH:="../openstack-helm-infra"} -cd ${OSH_INFRA_PATH} -./tools/gate/deploy-k8s-kubeadm.sh -cd ${CURRENT_DIR} diff --git a/tools/deployment/common/deploy-k8s.sh b/tools/deployment/common/deploy-k8s.sh deleted file mode 100755 index db2b264da1..0000000000 --- a/tools/deployment/common/deploy-k8s.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 - -CURRENT_DIR="$(pwd)" -: ${OSH_INFRA_PATH:="../openstack-helm-infra"} -cd ${OSH_INFRA_PATH} -./tools/gate/deploy-k8s.sh -cd ${CURRENT_DIR} diff --git a/tools/gate/files/heat-basic-vm-deployment.yaml b/tools/deployment/common/heat-basic-vm-deployment.yaml similarity index 100% rename from tools/gate/files/heat-basic-vm-deployment.yaml rename to tools/deployment/common/heat-basic-vm-deployment.yaml diff --git a/tools/gate/files/heat-public-net-deployment.yaml b/tools/deployment/common/heat-public-net-deployment.yaml similarity index 100% rename from tools/gate/files/heat-public-net-deployment.yaml rename to tools/deployment/common/heat-public-net-deployment.yaml diff --git a/tools/gate/files/heat-subnet-pool-deployment.yaml b/tools/deployment/common/heat-subnet-pool-deployment.yaml similarity index 100% rename from tools/gate/files/heat-subnet-pool-deployment.yaml rename to tools/deployment/common/heat-subnet-pool-deployment.yaml diff --git a/tools/gate/files/heat-vm-volume-attach.yaml b/tools/deployment/common/heat-vm-volume-attach.yaml similarity index 100% rename from tools/gate/files/heat-vm-volume-attach.yaml rename to tools/deployment/common/heat-vm-volume-attach.yaml diff --git a/tools/deployment/common/install-packages.sh b/tools/deployment/common/install-packages.sh deleted file mode 100755 index 4e1a977222..0000000000 --- a/tools/deployment/common/install-packages.sh +++ /dev/null @@ -1,30 +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 update -sudo apt-get install --no-install-recommends -y \ - ca-certificates \ - git \ - make \ - jq \ - nmap \ - curl \ - uuid-runtime \ - bc \ - python3-dev \ - net-tools \ - python3-pip \ - lvm2 diff --git a/tools/pull-images.sh b/tools/deployment/common/pull-images.sh similarity index 100% rename from tools/pull-images.sh rename to tools/deployment/common/pull-images.sh diff --git a/tools/gate/files/rally-reports.yaml b/tools/deployment/common/rally-reports.yaml similarity index 100% rename from tools/gate/files/rally-reports.yaml rename to tools/deployment/common/rally-reports.yaml diff --git a/tools/deployment/developer/common/170-setup-gateway.sh b/tools/deployment/common/setup-gateway.sh similarity index 100% rename from tools/deployment/developer/common/170-setup-gateway.sh rename to tools/deployment/common/setup-gateway.sh diff --git a/tools/deployment/developer/common/900-use-it.sh b/tools/deployment/common/use-it.sh similarity index 95% rename from tools/deployment/developer/common/900-use-it.sh rename to tools/deployment/common/use-it.sh index c77110fe0f..afd75e5a99 100755 --- a/tools/deployment/developer/common/900-use-it.sh +++ b/tools/deployment/common/use-it.sh @@ -26,7 +26,7 @@ openstack stack show "heat-public-net-deployment" || \ --parameter subnet_name=${OSH_EXT_SUBNET_NAME} \ --parameter subnet_cidr=${OSH_EXT_SUBNET} \ --parameter subnet_gateway=${OSH_BR_EX_ADDR%/*} \ - -t ./tools/gate/files/heat-public-net-deployment.yaml \ + -t ./tools/deployment/common/heat-public-net-deployment.yaml \ heat-public-net-deployment : ${OSH_PRIVATE_SUBNET_POOL:="10.0.0.0/8"} @@ -37,7 +37,7 @@ openstack stack show "heat-subnet-pool-deployment" || \ --parameter subnet_pool_name=${OSH_PRIVATE_SUBNET_POOL_NAME} \ --parameter subnet_pool_prefixes=${OSH_PRIVATE_SUBNET_POOL} \ --parameter subnet_pool_default_prefix_length=${OSH_PRIVATE_SUBNET_POOL_DEF_PREFIX} \ - -t ./tools/gate/files/heat-subnet-pool-deployment.yaml \ + -t ./tools/deployment/common/heat-subnet-pool-deployment.yaml \ heat-subnet-pool-deployment : ${OSH_EXT_NET_NAME:="public"} @@ -64,7 +64,7 @@ openstack stack show "heat-basic-vm-deployment" || \ --parameter ssh_key=${OSH_VM_KEY_STACK} \ --parameter cidr=${OSH_PRIVATE_SUBNET} \ --parameter dns_nameserver=${OSH_BR_EX_ADDR%/*} \ - -t ./tools/gate/files/heat-basic-vm-deployment.yaml \ + -t ./tools/deployment/common/heat-basic-vm-deployment.yaml \ heat-basic-vm-deployment FLOATING_IP=$(openstack stack output show \ @@ -127,7 +127,7 @@ if openstack service list -f value -c Type | grep -q "^volume"; then # Create and attach a block device to the instance openstack stack create --wait \ --parameter instance_uuid=${INSTANCE_ID} \ - -t ./tools/gate/files/heat-vm-volume-attach.yaml \ + -t ./tools/deployment/common/heat-vm-volume-attach.yaml \ heat-vm-volume-attach # Get the devices that are present on the instance diff --git a/tools/gate/tests/validate-umbrella-upgrade-config-changes-do-not-update-other-components.sh b/tools/deployment/common/validate-umbrella-upgrade-config-changes-do-not-update-other-components.sh similarity index 100% rename from tools/gate/tests/validate-umbrella-upgrade-config-changes-do-not-update-other-components.sh rename to tools/deployment/common/validate-umbrella-upgrade-config-changes-do-not-update-other-components.sh diff --git a/tools/gate/tests/validate-umbrella-upgrade-no-side-effects.sh b/tools/deployment/common/validate-umbrella-upgrade-no-side-effects.sh similarity index 100% rename from tools/gate/tests/validate-umbrella-upgrade-no-side-effects.sh rename to tools/deployment/common/validate-umbrella-upgrade-no-side-effects.sh diff --git a/tools/deployment/multinode/250-aodh.sh b/tools/deployment/component/aodh/aodh.sh similarity index 100% rename from tools/deployment/multinode/250-aodh.sh rename to tools/deployment/component/aodh/aodh.sh diff --git a/tools/deployment/multinode/260-ceilometer.sh b/tools/deployment/component/ceilometer/ceilometer.sh similarity index 100% rename from tools/deployment/multinode/260-ceilometer.sh rename to tools/deployment/component/ceilometer/ceilometer.sh diff --git a/tools/overrides/backends/networking/compute-kit-sr-iov.sh b/tools/deployment/component/compute-kit/compute-kit-sr-iov.sh similarity index 100% rename from tools/overrides/backends/networking/compute-kit-sr-iov.sh rename to tools/deployment/component/compute-kit/compute-kit-sr-iov.sh diff --git a/tools/deployment/multinode/190-magnum.sh b/tools/deployment/component/magnum/magnum.sh similarity index 100% rename from tools/deployment/multinode/190-magnum.sh rename to tools/deployment/component/magnum/magnum.sh diff --git a/tools/deployment/multinode/180-mistral.sh b/tools/deployment/component/mistral/mistral.sh similarity index 100% rename from tools/deployment/multinode/180-mistral.sh rename to tools/deployment/component/mistral/mistral.sh diff --git a/tools/deployment/developer/common/180-create-resource-for-octavia.sh b/tools/deployment/component/octavia/180-create-resource-for-octavia.sh similarity index 100% rename from tools/deployment/developer/common/180-create-resource-for-octavia.sh rename to tools/deployment/component/octavia/180-create-resource-for-octavia.sh diff --git a/tools/deployment/developer/common/190-create-octavia-certs.sh b/tools/deployment/component/octavia/190-create-octavia-certs.sh similarity index 100% rename from tools/deployment/developer/common/190-create-octavia-certs.sh rename to tools/deployment/component/octavia/190-create-octavia-certs.sh diff --git a/tools/deployment/developer/common/200-octavia.sh b/tools/deployment/component/octavia/200-octavia.sh similarity index 100% rename from tools/deployment/developer/common/200-octavia.sh rename to tools/deployment/component/octavia/200-octavia.sh diff --git a/tools/deployment/developer/ovn/120-openvswitch.sh b/tools/deployment/component/ovn/120-openvswitch.sh similarity index 100% rename from tools/deployment/developer/ovn/120-openvswitch.sh rename to tools/deployment/component/ovn/120-openvswitch.sh diff --git a/tools/deployment/developer/ovn/125-ovn.sh b/tools/deployment/component/ovn/125-ovn.sh similarity index 100% rename from tools/deployment/developer/ovn/125-ovn.sh rename to tools/deployment/component/ovn/125-ovn.sh diff --git a/tools/deployment/developer/ovn/140-compute-kit.sh b/tools/deployment/component/ovn/140-compute-kit.sh similarity index 100% rename from tools/deployment/developer/ovn/140-compute-kit.sh rename to tools/deployment/component/ovn/140-compute-kit.sh diff --git a/tools/deployment/multinode/170-senlin.sh b/tools/deployment/component/senlin/senlin.sh similarity index 100% rename from tools/deployment/multinode/170-senlin.sh rename to tools/deployment/component/senlin/senlin.sh diff --git a/tools/deployment/developer/ceph/000-install-packages.sh b/tools/deployment/developer/ceph/000-install-packages.sh deleted file mode 120000 index 8ad28d13b0..0000000000 --- a/tools/deployment/developer/ceph/000-install-packages.sh +++ /dev/null @@ -1 +0,0 @@ -../../common/install-packages.sh \ No newline at end of file diff --git a/tools/deployment/developer/ceph/010-deploy-k8s.sh b/tools/deployment/developer/ceph/010-deploy-k8s.sh deleted file mode 120000 index 3cb1bb90fa..0000000000 --- a/tools/deployment/developer/ceph/010-deploy-k8s.sh +++ /dev/null @@ -1 +0,0 @@ -../../common/deploy-k8s.sh \ No newline at end of file diff --git a/tools/deployment/developer/ceph/011-deploy-k8s-kubeadm.sh b/tools/deployment/developer/ceph/011-deploy-k8s-kubeadm.sh deleted file mode 120000 index 882b6c1f5b..0000000000 --- a/tools/deployment/developer/ceph/011-deploy-k8s-kubeadm.sh +++ /dev/null @@ -1 +0,0 @@ -../../common/deploy-k8s-kubeadm.sh \ No newline at end of file diff --git a/tools/deployment/developer/ceph/020-setup-client.sh b/tools/deployment/developer/ceph/020-setup-client.sh deleted file mode 120000 index 5ba93361cd..0000000000 --- a/tools/deployment/developer/ceph/020-setup-client.sh +++ /dev/null @@ -1 +0,0 @@ -../../common/setup-client.sh \ No newline at end of file diff --git a/tools/deployment/developer/ceph/030-ingress.sh b/tools/deployment/developer/ceph/030-ingress.sh deleted file mode 120000 index 7097683624..0000000000 --- a/tools/deployment/developer/ceph/030-ingress.sh +++ /dev/null @@ -1 +0,0 @@ -../../component/common/ingress.sh \ No newline at end of file diff --git a/tools/deployment/developer/ceph/040-ceph.sh b/tools/deployment/developer/ceph/040-ceph.sh deleted file mode 120000 index 1580b09632..0000000000 --- a/tools/deployment/developer/ceph/040-ceph.sh +++ /dev/null @@ -1 +0,0 @@ -../../component/ceph/ceph.sh \ No newline at end of file diff --git a/tools/deployment/developer/ceph/045-ceph-ns-activate.sh b/tools/deployment/developer/ceph/045-ceph-ns-activate.sh deleted file mode 100755 index 402ae007bb..0000000000 --- a/tools/deployment/developer/ceph/045-ceph-ns-activate.sh +++ /dev/null @@ -1,54 +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: Get the over-rides to use -export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}" -: ${OSH_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE:="$(./tools/deployment/common/get-values-overrides.sh ceph-provisioners)"} - -#NOTE: Lint and package chart -make -C ${HELM_CHART_ROOT_PATH} ceph-provisioners - -#NOTE: Deploy command -: ${OSH_EXTRA_HELM_ARGS:=""} -tee /tmp/ceph-openstack-config.yaml < /tmp/ceph-fs-uuid.txt -CEPH_PUBLIC_NETWORK="$(./tools/deployment/multinode/kube-node-subnet.sh)" -CEPH_CLUSTER_NETWORK="${CEPH_PUBLIC_NETWORK}" -CEPH_FS_ID="$(cat /tmp/ceph-fs-uuid.txt)" -#NOTE(portdirect): to use RBD devices with kernels < 4.5 this should be set to 'hammer' -LOWEST_CLUSTER_KERNEL_VERSION=$(kubectl get node -o go-template='{{range .items}}{{.status.nodeInfo.kernelVersion}}{{"\n"}}{{ end }}' | sort -V | tail -1) -if [ "$(echo ${LOWEST_CLUSTER_KERNEL_VERSION} | awk -F "." '{ print $1 }')" -lt "4" ] || [ "$(echo ${LOWEST_CLUSTER_KERNEL_VERSION} | awk -F "." '{ print $2 }')" -lt "15" ]; then - echo "Using hammer crush tunables" - CRUSH_TUNABLES=hammer -else - CRUSH_TUNABLES=null -fi -NUMBER_OF_OSDS="$(kubectl get nodes -l ceph-osd=enabled --no-headers | wc -l)" -tee /tmp/ceph.yaml << EOF -endpoints: - ceph_mon: - namespace: ceph -network: - public: ${CEPH_PUBLIC_NETWORK} - cluster: ${CEPH_CLUSTER_NETWORK} -deployment: - storage_secrets: true - ceph: true - rbd_provisioner: true - csi_rbd_provisioner: true - cephfs_provisioner: false - client_secrets: false -bootstrap: - enabled: true -conf: - ceph: - global: - fsid: ${CEPH_FS_ID} - mon_allow_pool_size_one: true - pool: - crush: - tunables: ${CRUSH_TUNABLES} - target: - osd: ${NUMBER_OF_OSDS} - final_osd: ${NUMBER_OF_OSDS} - pg_per_osd: 100 - storage: - osd: - - data: - type: bluestore - location: ${CEPH_OSD_DATA_DEVICE} - block_db: - location: ${CEPH_OSD_DB_WAL_DEVICE} - size: "5GB" - block_wal: - location: ${CEPH_OSD_DB_WAL_DEVICE} - size: "2GB" -storageclass: - cephfs: - provision_storage_class: false -manifests: - deployment_cephfs_provisioner: false - job_cephfs_client_key: false -EOF - -: ${OSH_INFRA_PATH:="../openstack-helm-infra"} -for CHART in ceph-mon ceph-osd ceph-client ceph-provisioners; do - make -C ${OSH_INFRA_PATH} ${CHART} - helm upgrade --install ${CHART} ${OSH_INFRA_PATH}/${CHART} \ - --namespace=ceph \ - --values=/tmp/ceph.yaml \ - ${OSH_EXTRA_HELM_ARGS} \ - ${OSH_EXTRA_HELM_ARGS_CEPH_DEPLOY} - - #NOTE: Wait for deploy - ./tools/deployment/common/wait-for-pods.sh ceph 1200 - - #NOTE: Validate deploy - MON_POD=$(kubectl get pods \ - --namespace=ceph \ - --selector="application=ceph" \ - --selector="component=mon" \ - --no-headers | awk '{ print $1; exit }') - kubectl exec -n ceph ${MON_POD} -- ceph -s -done diff --git a/tools/deployment/multinode/040-ceph-ns-activate.sh b/tools/deployment/multinode/040-ceph-ns-activate.sh deleted file mode 100755 index cff117536d..0000000000 --- a/tools/deployment/multinode/040-ceph-ns-activate.sh +++ /dev/null @@ -1,48 +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: Deploy command -CEPH_PUBLIC_NETWORK="$(./tools/deployment/multinode/kube-node-subnet.sh)" -CEPH_CLUSTER_NETWORK="${CEPH_PUBLIC_NETWORK}" -tee /tmp/ceph-openstack-config.yaml </dev/null 2>&1 || true -openstack stack create --wait \ - --parameter network_name=${OSH_EXT_NET_NAME} \ - --parameter physical_network_name=public \ - --parameter subnet_name=${OSH_EXT_SUBNET_NAME} \ - --parameter subnet_cidr=${OSH_EXT_SUBNET} \ - --parameter subnet_gateway=${OSH_BR_EX_ADDR%/*} \ - -t ./tools/gate/files/heat-public-net-deployment.yaml \ - heat-public-net-deployment - -export OSH_PRIVATE_SUBNET_POOL="10.0.0.0/8" -export OSH_PRIVATE_SUBNET_POOL_NAME="shared-default-subnetpool" -export OSH_PRIVATE_SUBNET_POOL_DEF_PREFIX="24" -openstack stack delete --wait --yes heat-subnet-pool-deployment >/dev/null 2>&1 || true -openstack stack create --wait \ - --parameter subnet_pool_name=${OSH_PRIVATE_SUBNET_POOL_NAME} \ - --parameter subnet_pool_prefixes=${OSH_PRIVATE_SUBNET_POOL} \ - --parameter subnet_pool_default_prefix_length=${OSH_PRIVATE_SUBNET_POOL_DEF_PREFIX} \ - -t ./tools/gate/files/heat-subnet-pool-deployment.yaml \ - heat-subnet-pool-deployment - -FLAVOR_ID=$(openstack flavor show m1.tiny -f value -c id) -IMAGE_ID=$(openstack image list -f value -c Name -c ID | \ - grep " Cirros " | head -1 | cut -f 1 -d ' ') -NETWORK_ID=$(openstack network show public -f value -c id) - -if [ "x$(systemd-detect-virt)" == "xnone" ]; then - HYPERVISOR_TYPE="qemu" -fi - -#NOTE: Deploy tempest -tee /tmp/tempest.yaml << EOF -conf: - tempest: - compute: - flavor_ref: ${FLAVOR_ID} - image_ref: ${IMAGE_ID} - image_ref_alt: ${IMAGE_ID} - hypervisor_type: ${HYPERVISOR_TYPE} - network: - default_network: ${OSH_PRIVATE_SUBNET_POOL} - project_network_cidr: 172.0.4.0/16 - floating_network_name: "public" - public_network_id: ${NETWORK_ID} - validation: - image_ssh_user: "cirros" - image_ssh_password: "gocubsgo" - network_for_ssh: "public" - floating_ip_range: ${OSH_EXT_SUBNET} -pvc: - enabled: false -EOF - -envsubst < /tmp/tempest.yaml - -helm upgrade --install tempest ./tempest \ - --namespace=openstack \ - --values=/tmp/tempest.yaml \ - ${OSH_EXTRA_HELM_ARGS} \ - ${OSH_EXTRA_HELM_ARGS_TEMPEST} - -#NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh openstack 2400 - -#NOTE: Validate Deployment info -kubectl get -n openstack jobs diff --git a/tools/deployment/multinode/110-cinder.sh b/tools/deployment/multinode/110-cinder.sh deleted file mode 100755 index d5e74c60f1..0000000000 --- a/tools/deployment/multinode/110-cinder.sh +++ /dev/null @@ -1,86 +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: Get the over-rides to use -: ${OSH_EXTRA_HELM_ARGS_CINDER:="$(./tools/deployment/common/get-values-overrides.sh cinder)"} -: ${RUN_HELM_TESTS:="yes"} - -#NOTE: Lint and package chart -make cinder - -#NOTE: Deploy command -tee /tmp/cinder.yaml << EOF -conf: - ceph: - pools: - backup: - replication: 1 - crush_rule: same_host - chunk_size: 8 - app_name: cinder-backup - # default pool used by rbd1 backend - cinder.volumes: - replication: 1 - crush_rule: same_host - chunk_size: 8 - app_name: cinder-volume - # secondary pool used by rbd2 backend - cinder.volumes.gold: - replication: 1 - crush_rule: same_host - chunk_size: 8 - app_name: cinder-volume - backends: - # add an extra storage backend same values as rbd1 (see - # cinder/values.yaml) except for volume_backend_name and rbd_pool - rbd2: - volume_driver: cinder.volume.drivers.rbd.RBDDriver - volume_backend_name: rbd2 - rbd_pool: cinder.volumes.gold - rbd_ceph_conf: "/etc/ceph/ceph.conf" - rbd_flatten_volume_from_snapshot: false - report_discard_supported: true - rbd_max_clone_depth: 5 - rbd_store_chunk_size: 4 - rados_connect_timeout: -1 - rbd_user: cinder - rbd_secret_uuid: 457eb676-33da-42ec-9a8c-9293d545c337 -pod: - replicas: - api: 2 - volume: 1 - scheduler: 1 - backup: 1 -EOF -helm upgrade --install cinder ./cinder \ - --namespace=openstack \ - --values=/tmp/cinder.yaml \ - ${OSH_EXTRA_HELM_ARGS} \ - ${OSH_EXTRA_HELM_ARGS_CINDER} - -#NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -export OS_CLOUD=openstack_helm -openstack service list -sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx -openstack volume type list -openstack volume type list --default - -# Run helm tests -if [ "x${RUN_HELM_TESTS}" != "xno" ]; then - ./tools/deployment/common/run-helm-tests.sh cinder -fi diff --git a/tools/deployment/multinode/120-openvswitch.sh b/tools/deployment/multinode/120-openvswitch.sh deleted file mode 100755 index 120c0589cb..0000000000 --- a/tools/deployment/multinode/120-openvswitch.sh +++ /dev/null @@ -1,30 +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: Get the over-rides to use -: ${OSH_INFRA_PATH:="../openstack-helm-infra"} -: ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH:="$(./tools/deployment/common/get-values-overrides.sh openvswitch)"} - -#NOTE: Lint and package chart -make -C ${OSH_INFRA_PATH} openvswitch - -#NOTE: Deploy command -helm upgrade --install openvswitch ${OSH_INFRA_PATH}/openvswitch \ - --namespace=openstack \ - ${OSH_EXTRA_HELM_ARGS} \ - ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH} - -#NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh openstack diff --git a/tools/deployment/multinode/130-libvirt.sh b/tools/deployment/multinode/130-libvirt.sh deleted file mode 100755 index c1a9588990..0000000000 --- a/tools/deployment/multinode/130-libvirt.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 - -export OS_CLOUD=openstack_helm -CEPH_ENABLED=false -if openstack service list -f value -c Type | grep -q "^volume" && \ - openstack volume type list -f value -c Name | grep -q "rbd"; then - CEPH_ENABLED=true -fi - -#NOTE: Get the over-rides to use -: ${OSH_INFRA_PATH:="../openstack-helm-infra"} -: ${OSH_EXTRA_HELM_ARGS_LIBVIRT:="$(./tools/deployment/common/get-values-overrides.sh libvirt)"} - -#NOTE: Lint and package chart -make -C ${OSH_INFRA_PATH} libvirt - -#NOTE: Get resource_type of kubernetes cgroup -KUBERNETES_CGROUP=$(sudo docker info | grep "Cgroup Driver" | awk -F': ' '{print $2}' | grep -q systemd && echo kubepods.slice || echo kubepods) - -#NOTE: Deploy libvirt -tee /tmp/libvirt.yaml << EOF -conf: - kubernetes: - cgroup: ${KUBERNETES_CGROUP} -EOF - -#NOTE: Deploy libvirt -helm upgrade --install libvirt ${OSH_INFRA_PATH}/libvirt \ - --namespace=openstack \ - --values=/tmp/libvirt.yaml \ - --set conf.ceph.enabled=${CEPH_ENABLED} \ - ${OSH_EXTRA_HELM_ARGS} \ - ${OSH_EXTRA_HELM_ARGS_LIBVIRT} diff --git a/tools/deployment/multinode/140-compute-kit.sh b/tools/deployment/multinode/140-compute-kit.sh deleted file mode 100755 index 39e542392a..0000000000 --- a/tools/deployment/multinode/140-compute-kit.sh +++ /dev/null @@ -1,142 +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 - -: ${RUN_HELM_TESTS:="yes"} - -export OS_CLOUD=openstack_helm -CEPH_ENABLED=false -if openstack service list -f value -c Type | grep -q "^volume" && \ - openstack volume type list -f value -c Name | grep -q "rbd"; then - CEPH_ENABLED=true -fi - -#NOTE: Get the over-rides to use -: ${OSH_EXTRA_HELM_ARGS_NOVA:="$(./tools/deployment/common/get-values-overrides.sh nova)"} - -#NOTE: Lint and package chart -make nova - -#NOTE: Deploy nova -tee /tmp/nova.yaml << EOF -pod: - replicas: - osapi: 2 - conductor: 2 -EOF - -#NOTE: Deploy nova -: ${OSH_EXTRA_HELM_ARGS:=""} -if [ "x$(systemd-detect-virt)" == "xnone" ]; then - echo 'OSH is not being deployed in virtualized environment' - helm upgrade --install nova ./nova \ - --namespace=openstack \ - --values=/tmp/nova.yaml \ - --set bootstrap.wait_for_computes.enabled=true \ - --set conf.ceph.enabled=${CEPH_ENABLED} \ - ${OSH_EXTRA_HELM_ARGS:=} \ - ${OSH_EXTRA_HELM_ARGS_NOVA} -else - echo 'OSH is being deployed in virtualized environment, using qemu for nova' - helm upgrade --install nova ./nova \ - --namespace=openstack \ - --values=/tmp/nova.yaml \ - --set bootstrap.wait_for_computes.enabled=true \ - --set conf.ceph.enabled=${CEPH_ENABLED} \ - --set conf.nova.libvirt.virt_type=qemu \ - --set conf.nova.libvirt.cpu_mode=none \ - ${OSH_EXTRA_HELM_ARGS:=} \ - ${OSH_EXTRA_HELM_ARGS_NOVA} -fi - -# Get overrides -: ${OSH_EXTRA_HELM_ARGS_PLACEMENT:="$(./tools/deployment/common/get-values-overrides.sh placement)"} - -# Lint and package -make placement - -tee /tmp/placement.yaml << EOF -pod: - replicas: - api: 2 -EOF -# Deploy -helm upgrade --install placement ./placement \ - --namespace=openstack \ ---values=/tmp/placement.yaml \ - ${OSH_EXTRA_HELM_ARGS:=} \ - ${OSH_EXTRA_HELM_ARGS_PLACEMENT} - -#NOTE: Get the over-rides to use -: ${OSH_EXTRA_HELM_ARGS_NEUTRON:="$(./tools/deployment/common/get-values-overrides.sh neutron)"} - -#NOTE: Lint and package chart -make neutron - -tee /tmp/neutron.yaml << EOF -network: - interface: - tunnel: docker0 -pod: - replicas: - server: 2 -conf: - neutron: - DEFAULT: - l3_ha: False - max_l3_agents_per_router: 1 - l3_ha_network_type: vxlan - dhcp_agents_per_network: 1 - plugins: - ml2_conf: - ml2_type_flat: - flat_networks: public - openvswitch_agent: - agent: - tunnel_types: vxlan - ovs: - bridge_mappings: public:br-ex - linuxbridge_agent: - linux_bridge: - bridge_mappings: public:br-ex -EOF - -helm upgrade --install neutron ./neutron \ - --namespace=openstack \ - --values=/tmp/neutron.yaml \ - ${OSH_RELEASE_OVERRIDES_NEUTRON} \ - ${OSH_EXTRA_HELM_ARGS} \ - ${OSH_EXTRA_HELM_ARGS_NEUTRON} - -# If compute kit installed using Tungsten Fubric, it will be alive when Tunsten Fabric become active. -if [[ "$FEATURE_GATES" =~ (,|^)tf(,|$) ]]; then - exit 0 -fi -#NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -export OS_CLOUD=openstack_helm -openstack service list -sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx -openstack compute service list -openstack network agent list -openstack hypervisor list - -if [ "x${RUN_HELM_TESTS}" == "xno" ]; then - exit 0 -fi - -./tools/deployment/common/run-helm-tests.sh nova -./tools/deployment/common/run-helm-tests.sh neutron diff --git a/tools/deployment/multinode/150-heat.sh b/tools/deployment/multinode/150-heat.sh deleted file mode 100755 index cb5b92e9e1..0000000000 --- a/tools/deployment/multinode/150-heat.sh +++ /dev/null @@ -1,48 +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: Get the over-rides to use -: ${OSH_EXTRA_HELM_ARGS_HEAT:="$(./tools/deployment/common/get-values-overrides.sh heat)"} - -#NOTE: Lint and package chart -make heat - -tee /tmp/heat.yaml << EOF -pod: - replicas: - api: 2 - cfn: 2 - cloudwatch: 2 - engine: 2 -EOF - -#NOTE: Deploy command -: ${OSH_EXTRA_HELM_ARGS:=""} -helm upgrade --install heat ./heat \ - --namespace=openstack \ - --values=/tmp/heat.yaml \ - ${OSH_EXTRA_HELM_ARGS} \ - ${OSH_EXTRA_HELM_ARGS_HEAT} - -#NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -export OS_CLOUD=openstack_helm -openstack service list -openstack endpoint list -sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx - -openstack --os-interface public orchestration service list diff --git a/tools/deployment/multinode/160-barbican.sh b/tools/deployment/multinode/160-barbican.sh deleted file mode 100755 index 2f10c9bb9c..0000000000 --- a/tools/deployment/multinode/160-barbican.sh +++ /dev/null @@ -1,39 +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 - -: ${RUN_HELM_TESTS:="yes"} - -#NOTE: Lint and package chart -make barbican - -#NOTE: Deploy command -helm upgrade --install barbican ./barbican \ - --namespace=openstack \ - --set pod.replicas.api=2 \ - ${OSH_EXTRA_HELM_ARGS} \ - ${OSH_EXTRA_HELM_ARGS_BARBICAN} - -#NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -export OS_CLOUD=openstack_helm -openstack service list -sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx - -# Run helm tests -if [ "x${RUN_HELM_TESTS}" != "xno" ]; then - ./tools/deployment/common/run-helm-tests.sh barbican -fi diff --git a/tools/deployment/multinode/210-postgresql.sh b/tools/deployment/multinode/210-postgresql.sh deleted file mode 100755 index d618dddacb..0000000000 --- a/tools/deployment/multinode/210-postgresql.sh +++ /dev/null @@ -1,29 +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 - -export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}" - -#NOTE: Lint and package chart -make -C ${HELM_CHART_ROOT_PATH} postgresql - -#NOTE: Wait for deploy -: ${OSH_INFRA_PATH:="../openstack-helm-infra"} -helm upgrade --install postgresql ${OSH_INFRA_PATH}/postgresql \ - --namespace=openstack \ - ${OSH_EXTRA_HELM_ARGS} \ - ${OSH_EXTRA_HELM_ARGS_POSTGRESQL} - -#NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh openstack diff --git a/tools/deployment/multinode/220-gnocchi.sh b/tools/deployment/multinode/220-gnocchi.sh deleted file mode 100755 index 41a14c461b..0000000000 --- a/tools/deployment/multinode/220-gnocchi.sh +++ /dev/null @@ -1,34 +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 - -export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}" - -#NOTE: Lint and package chart -make -C ${HELM_CHART_ROOT_PATH} gnocchi - -#NOTE: Wait for deploy -: ${OSH_INFRA_PATH:="../openstack-helm-infra"} -helm upgrade --install gnocchi ${OSH_INFRA_PATH}/gnocchi \ - --namespace=openstack \ - --set pod.replicas.api=2 \ - ${OSH_EXTRA_HELM_ARGS} \ - ${OSH_EXTRA_HELM_ARGS_GNOCCHI} - -#NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -export OS_CLOUD=openstack_helm -openstack service list diff --git a/tools/deployment/multinode/230-mongodb.sh b/tools/deployment/multinode/230-mongodb.sh deleted file mode 100755 index 47404236e8..0000000000 --- a/tools/deployment/multinode/230-mongodb.sh +++ /dev/null @@ -1,29 +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 - -export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}" - -#NOTE: Lint and package chart -make -C ${HELM_CHART_ROOT_PATH} mongodb - -#NOTE: Wait for deploy -: ${OSH_INFRA_PATH:="../openstack-helm-infra"} -helm upgrade --install mongodb ${OSH_INFRA_PATH}/mongodb \ - --namespace=openstack \ - ${OSH_EXTRA_HELM_ARGS} \ - ${OSH_EXTRA_HELM_ARGS_MONGODB} - -#NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh openstack diff --git a/tools/deployment/multinode/800-setup-gateway.sh b/tools/deployment/multinode/800-setup-gateway.sh deleted file mode 100755 index 5cc68c682e..0000000000 --- a/tools/deployment/multinode/800-setup-gateway.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 - -# Assign IP address to br-ex -: ${OSH_EXT_SUBNET:="172.24.4.0/24"} -: ${OSH_BR_EX_ADDR:="172.24.4.1/24"} -sudo ip addr add ${OSH_BR_EX_ADDR} dev br-ex -sudo ip link set br-ex up - -: ${DNSMASQ_IMAGE:=docker.io/openstackhelm/neutron:ocata} - -# NOTE(portdirect): With Docker >= 1.13.1 the default FORWARD chain policy is -# configured to DROP, for the l3 agent to function as expected and for -# VMs to reach the outside world correctly this needs to be set to ACCEPT. -sudo iptables -P FORWARD ACCEPT - -# Setup masquerading on default route dev to public subnet by searching for the -# interface with default routing, if multiple default routes exist then select -# the one with the lowest metric. -DEFAULT_ROUTE_DEV=$(route -n | awk '/^0.0.0.0/ { print $5 " " $NF }' | sort | awk '{ print $NF; exit }') -sudo iptables -t nat -A POSTROUTING -o ${DEFAULT_ROUTE_DEV} -s ${OSH_EXT_SUBNET} -j MASQUERADE - -# NOTE(portdirect): Setup DNS for public endpoints -sudo docker run -d \ - --name br-ex-dns-server \ - --net host \ - --cap-add=NET_ADMIN \ - --volume /etc/kubernetes/kubelet-resolv.conf:/etc/kubernetes/kubelet-resolv.conf:ro \ - --entrypoint dnsmasq \ - ${DNSMASQ_IMAGE} \ - --keep-in-foreground \ - --no-hosts \ - --bind-interfaces \ - --resolv-file=/etc/kubernetes/kubelet-resolv.conf \ - --address="/svc.cluster.local/${OSH_BR_EX_ADDR%/*}" \ - --listen-address="${OSH_BR_EX_ADDR%/*}" -sleep 1 -sudo docker top br-ex-dns-server diff --git a/tools/deployment/multinode/900-use-it.sh b/tools/deployment/multinode/900-use-it.sh deleted file mode 100755 index 3de75f750e..0000000000 --- a/tools/deployment/multinode/900-use-it.sh +++ /dev/null @@ -1,136 +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 - -export OS_CLOUD=openstack_helm - -: ${OSH_EXT_NET_NAME:="public"} -: ${OSH_EXT_SUBNET_NAME:="public-subnet"} -: ${OSH_EXT_SUBNET:="172.24.4.0/24"} -: ${OSH_BR_EX_ADDR:="172.24.4.1/24"} -openstack stack create --wait \ - --parameter network_name=${OSH_EXT_NET_NAME} \ - --parameter physical_network_name=public \ - --parameter subnet_name=${OSH_EXT_SUBNET_NAME} \ - --parameter subnet_cidr=${OSH_EXT_SUBNET} \ - --parameter subnet_gateway=${OSH_BR_EX_ADDR%/*} \ - -t ./tools/gate/files/heat-public-net-deployment.yaml \ - heat-public-net-deployment - -: ${OSH_PRIVATE_SUBNET_POOL:="10.0.0.0/8"} -: ${OSH_PRIVATE_SUBNET_POOL_NAME:="shared-default-subnetpool"} -: ${OSH_PRIVATE_SUBNET_POOL_DEF_PREFIX:="24"} -openstack stack create --wait \ - --parameter subnet_pool_name=${OSH_PRIVATE_SUBNET_POOL_NAME} \ - --parameter subnet_pool_prefixes=${OSH_PRIVATE_SUBNET_POOL} \ - --parameter subnet_pool_default_prefix_length=${OSH_PRIVATE_SUBNET_POOL_DEF_PREFIX} \ - -t ./tools/gate/files/heat-subnet-pool-deployment.yaml \ - heat-subnet-pool-deployment - -: ${OSH_EXT_NET_NAME:="public"} -: ${OSH_VM_KEY_STACK:="heat-vm-key"} -: ${OSH_PRIVATE_SUBNET:="10.0.0.0/24"} -# NOTE(portdirect): We do this fancy, and seemingly pointless, footwork to get -# the full image name for the cirros Image without having to be explicit. -IMAGE_NAME=$(openstack image show -f value -c name \ - $(openstack image list -f csv | awk -F ',' '{ print $2 "," $1 }' | \ - grep "^\"Cirros" | head -1 | awk -F ',' '{ print $2 }' | tr -d '"')) - -# Setup SSH Keypair in Nova -mkdir -p ${HOME}/.ssh -openstack keypair create --private-key ${HOME}/.ssh/osh_key ${OSH_VM_KEY_STACK} -chmod 600 ${HOME}/.ssh/osh_key - -openstack stack create --wait \ - --parameter public_net=${OSH_EXT_NET_NAME} \ - --parameter image="${IMAGE_NAME}" \ - --parameter ssh_key=${OSH_VM_KEY_STACK} \ - --parameter cidr=${OSH_PRIVATE_SUBNET} \ - --parameter dns_nameserver=${OSH_BR_EX_ADDR%/*} \ - -t ./tools/gate/files/heat-basic-vm-deployment.yaml \ - heat-basic-vm-deployment - -if ! openstack server list -c Status -f value | grep -q "ACTIVE"; then - echo "VM is not active" - openstack server list --long - exit -1 -fi - -# The following checks the connictivity of the VM created. -# The networking for multinode needs to be enhance to be able to run the -# following code. Hence commenting this code out. -# -# FLOATING_IP=$(openstack stack output show \ -# heat-basic-vm-deployment \ -# floating_ip \ -# -f value -c output_value) -# -# function wait_for_ssh_port { -# # Default wait timeout is 300 seconds -# set +x -# end=$(date +%s) -# if ! [ -z $2 ]; then -# end=$((end + $2)) -# else -# end=$((end + 300)) -# fi -# while true; do -# # Use Nmap as its the same on Ubuntu and RHEL family distros -# nmap -Pn -p22 $1 | awk '$1 ~ /22/ {print $2}' | grep -q 'open' && \ -# break || true -# sleep 1 -# now=$(date +%s) -# [ $now -gt $end ] && echo "Could not connect to $1 port 22 in time" && exit -1 -# done -# set -x -# } -# wait_for_ssh_port $FLOATING_IP -# -# # SSH into the VM and check it can reach the outside world -# ssh-keyscan "$FLOATING_IP" >> ~/.ssh/known_hosts -# ssh -i ${HOME}/.ssh/osh_key cirros@${FLOATING_IP} ping -q -c 1 -W 2 ${OSH_BR_EX_ADDR%/*} -# -# # Check the VM can reach the metadata server -# ssh -i ${HOME}/.ssh/osh_key cirros@${FLOATING_IP} curl --verbose --connect-timeout 5 169.254.169.254 -# -# # Check the VM can reach the keystone server -# ssh -i ${HOME}/.ssh/osh_key cirros@${FLOATING_IP} curl --verbose --connect-timeout 5 keystone.openstack.svc.cluster.local -# -# # Check to see if cinder has been deployed, if it has then perform a volume attach. -# if openstack service list -f value -c Type | grep -q "^volume"; then -# INSTANCE_ID=$(openstack stack output show \ -# heat-basic-vm-deployment \ -# instance_uuid \ -# -f value -c output_value) -# -# # Get the devices that are present on the instance -# DEVS_PRE_ATTACH=$(mktemp) -# ssh -i ${HOME}/.ssh/osh_key cirros@${FLOATING_IP} lsblk > ${DEVS_PRE_ATTACH} -# -# # Create and attach a block device to the instance -# openstack stack create --wait \ -# --parameter instance_uuid=${INSTANCE_ID} \ -# -t ./tools/gate/files/heat-vm-volume-attach.yaml \ -# heat-vm-volume-attach -# -# # Get the devices that are present on the instance -# DEVS_POST_ATTACH=$(mktemp) -# ssh -i ${HOME}/.ssh/osh_key cirros@${FLOATING_IP} lsblk > ${DEVS_POST_ATTACH} -# -# # Check that we have the expected number of extra devices on the instance post attach -# if ! [ "$(comm -13 ${DEVS_PRE_ATTACH} ${DEVS_POST_ATTACH} | wc -l)" -eq "1" ]; then -# echo "Volume not successfully attached" -# exit 1 -# fi -# fi diff --git a/tools/deployment/multinode/kube-node-subnet.sh b/tools/deployment/multinode/kube-node-subnet.sh deleted file mode 100755 index 9ed567421f..0000000000 --- a/tools/deployment/multinode/kube-node-subnet.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 -e - -UTILS_IMAGE=docker.io/openstackhelm/gate-utils:v0.1.0 -NODE_IPS=$(mktemp) -kubectl get nodes -o json | jq -r '.items[].status.addresses[] | select(.type=="InternalIP").address' | sort -V > $NODE_IPS -function run_and_log_ipcalc { - POD_NAME="tmp-$(cat /dev/urandom | env LC_CTYPE=C tr -dc a-z | head -c 5; echo)" - kubectl run ${POD_NAME} \ - --wait \ - --image ${UTILS_IMAGE} \ - --restart=Never \ - ipcalc -- "$1" - end=$(($(date +%s) + 900)) - until kubectl get pod/${POD_NAME} -o go-template='{{.status.phase}}' | grep -q Succeeded; do - now=$(date +%s) - [ $now -gt $end ] && echo containers failed to start. && \ - kubectl get pod/${POD_NAME} -o wide && exit 1 - done - kubectl logs pod/${POD_NAME} - kubectl delete pod/${POD_NAME} -} -FIRST_IP_SUBNET=$(run_and_log_ipcalc "$(head -n 1 ${NODE_IPS})/24" | awk '/^Network/ { print $2 }') -LAST_IP_SUBNET=$(run_and_log_ipcalc "$(tail -n 1 ${NODE_IPS})/24" | awk '/^Network/ { print $2 }') -rm -f $NODE_IPS -function ip_diff { - echo $(($(echo $LAST_IP_SUBNET | awk -F '.' "{ print \$$1}") - $(echo $FIRST_IP_SUBNET | awk -F '.' "{ print \$$1}"))) -} -for X in {1..4}; do - if ! [ "$(ip_diff ${X})" -eq "0" ]; then - SUBMASK=$((((${X} - 1 )) * 8)) - break - elif [ ${X} -eq "4" ]; then - SUBMASK=24 - fi -done -echo ${FIRST_IP_SUBNET%/*}/${SUBMASK} diff --git a/tools/gate/deploy-k8s.sh b/tools/gate/deploy-k8s.sh deleted file mode 100755 index db2b264da1..0000000000 --- a/tools/gate/deploy-k8s.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 - -CURRENT_DIR="$(pwd)" -: ${OSH_INFRA_PATH:="../openstack-helm-infra"} -cd ${OSH_INFRA_PATH} -./tools/gate/deploy-k8s.sh -cd ${CURRENT_DIR} diff --git a/tools/gate/files/template-python.sh b/tools/gate/files/template-python.sh deleted file mode 100755 index 19ef3a9329..0000000000 --- a/tools/gate/files/template-python.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -EXCLUDES="helm-toolkit doc tests tools logs tmp roles playbooks releasenotes zuul.d python-files" -DIRS=`ls -d */ | cut -f1 -d'/'` - -for EX in $EXCLUDES; do - DIRS=`echo $DIRS | sed "s/\b$EX\b//g"` -done - -for DIR in $DIRS; do - PYFILES=$(helm template $DIR | yq 'select(.data != null) | .data | to_entries | map(select(.key | test(".*\\.py"))) | select(length > 0) | values[] | {(.key) : (.value)}' | jq -s add) - PYKEYS=$(echo "$PYFILES" | jq -r 'select(. != null) | keys[]') - for KEY in $PYKEYS; do - echo "$PYFILES" | jq -r --arg KEY "$KEY" '.[$KEY]' > ./python-files/"$DIR-$KEY" - done -done diff --git a/tools/gate/playbooks/buildset_registry_alias.yaml b/tools/gate/playbooks/buildset_registry_alias.yaml deleted file mode 100644 index 3ed3b25ef7..0000000000 --- a/tools/gate/playbooks/buildset_registry_alias.yaml +++ /dev/null @@ -1,20 +0,0 @@ -- name: Configure /etc/hosts for buildset_registry to workaround docker not understanding ipv6 addresses - become: true - lineinfile: - path: /etc/hosts - state: present - regex: "^{{ buildset_registry.host }}\tzuul-jobs.buildset-registry$" - line: "{{ buildset_registry.host }}\tzuul-jobs.buildset-registry" - insertafter: EOF - when: - - buildset_registry.host | ipaddr -- name: Set buildset_registry alias variable when using ip - set_fact: - buildset_registry_alias: zuul-jobs.buildset-registry - when: - - buildset_registry.host | ipaddr -- name: Set buildset_registry alias variable when using name - set_fact: - buildset_registry_alias: "{{ buildset_registry.host }}" - when: - - not ( buildset_registry.host | ipaddr ) diff --git a/tools/gate/playbooks/helm3-linter.yaml b/tools/gate/playbooks/helm3-linter.yaml deleted file mode 100644 index 5816ce452f..0000000000 --- a/tools/gate/playbooks/helm3-linter.yaml +++ /dev/null @@ -1,40 +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. - -# TODO(gagehugo): Put this in osh-infra and run it from there - -- hosts: all - tasks: - - name: install helm3 - become_user: root - shell: | - TMP_DIR=$(mktemp -d) - curl -sSL https://get.helm.sh/helm-${HELM_VERSION}-linux-amd64.tar.gz | tar -zxv --strip-components=1 -C ${TMP_DIR} - sudo mv ${TMP_DIR}/helm /usr/bin/helm - rm -rf ${TMP_DIR} - environment: - HELM_VERSION: "v3.6.3" - args: - executable: /bin/bash - - - name: updates the requirements due to the lack of helm serve in helm 3 - shell: | - find "{{ zuul.project.src_dir }}" -type f -name "requirements.yaml" -exec sed -i "s#http://localhost:8879/charts#https://tarballs.opendev.org/openstack/openstack-helm-infra#g" {} \; - args: - executable: /bin/bash - - - name: make all - make: - chdir: "{{ zuul.project.src_dir }}" - target: all -... diff --git a/tools/gate/playbooks/ironic-deploy.yaml b/tools/gate/playbooks/ironic-deploy.yaml deleted file mode 100644 index d8f86e2150..0000000000 --- a/tools/gate/playbooks/ironic-deploy.yaml +++ /dev/null @@ -1,212 +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: Deploy Packages - environment: - OSH_OPENSTACK_RELEASE: "{{ osh_openstack_release }}" - OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" - OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}" - zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" - shell: | - set -xe; - ./tools/deployment/baremetal/000-install-packages.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Setup Nodes - environment: - OSH_OPENSTACK_RELEASE: "{{ osh_openstack_release }}" - OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" - OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}" - zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" - shell: | - set -xe; - ./tools/deployment/baremetal/005-setup-nodes.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Deploy clients - environment: - OSH_OPENSTACK_RELEASE: "{{ osh_openstack_release }}" - OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" - OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}" - zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" - shell: | - set -xe; - ./tools/deployment/baremetal/010-setup-client.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Deploy ingress - environment: - OSH_OPENSTACK_RELEASE: "{{ osh_openstack_release }}" - OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" - OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}" - zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" - shell: | - set -xe; - ./tools/deployment/baremetal/020-ingress.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Deploy Ceph - environment: - OSH_OPENSTACK_RELEASE: "{{ osh_openstack_release }}" - OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" - OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}" - zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" - shell: | - set -xe; - ./tools/deployment/baremetal/030-ceph.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Setup openstack namespace for ceph - environment: - OSH_OPENSTACK_RELEASE: "{{ osh_openstack_release }}" - OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" - OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}" - zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" - shell: | - set -xe; - ./tools/deployment/baremetal/035-ceph-ns-activate.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Deploy MariaDB - environment: - OSH_OPENSTACK_RELEASE: "{{ osh_openstack_release }}" - OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" - OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}" - zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" - shell: | - set -xe; - ./tools/deployment/baremetal/040-mariadb.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Deploy RabbitMQ - environment: - OSH_OPENSTACK_RELEASE: "{{ osh_openstack_release }}" - OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" - OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}" - zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" - shell: | - set -xe; - ./tools/deployment/baremetal/050-rabbitmq.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Deploy Memcached - environment: - OSH_OPENSTACK_RELEASE: "{{ osh_openstack_release }}" - OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" - OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}" - zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" - shell: | - set -xe; - ./tools/deployment/baremetal/060-memcached.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Deploy Keystone - environment: - OSH_OPENSTACK_RELEASE: "{{ osh_openstack_release }}" - OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" - OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}" - zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" - shell: | - set -xe; - ./tools/deployment/baremetal/070-keystone.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Deploy Ceph RadosGW Endpoints - environment: - OSH_OPENSTACK_RELEASE: "{{ osh_openstack_release }}" - OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" - OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}" - zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" - shell: | - set -xe; - ./tools/deployment/baremetal/080-ceph-radosgateway.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Deploy Glance - environment: - OSH_OPENSTACK_RELEASE: "{{ osh_openstack_release }}" - OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" - OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}" - zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" - shell: | - set -xe; - ./tools/deployment/baremetal/090-glance.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Deploy Heat - environment: - OSH_OPENSTACK_RELEASE: "{{ osh_openstack_release }}" - OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" - OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}" - zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" - shell: | - set -xe; - ./tools/deployment/baremetal/100-heat.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Deploy Compute Kit - environment: - OSH_OPENSTACK_RELEASE: "{{ osh_openstack_release }}" - OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" - OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}" - zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" - shell: | - set -xe; - ./tools/deployment/baremetal/110-compute-kit.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Create baremetal host aggregate - environment: - OSH_OPENSTACK_RELEASE: "{{ osh_openstack_release }}" - OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" - OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}" - zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" - shell: | - set -xe; - ./tools/deployment/baremetal/800-create-baremetal-host-aggregate.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Register baremetal nodes - environment: - OSH_OPENSTACK_RELEASE: "{{ osh_openstack_release }}" - OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" - OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}" - zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" - shell: | - set -xe; - ./tools/deployment/baremetal/810-register-baremetal-nodes.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Create baremetal flavor - environment: - OSH_OPENSTACK_RELEASE: "{{ osh_openstack_release }}" - OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" - OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}" - zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" - shell: | - set -xe; - ./tools/deployment/baremetal/820-create-baremetal-flavor.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Deploy Node - environment: - OSH_OPENSTACK_RELEASE: "{{ osh_openstack_release }}" - OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" - OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}" - zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" - shell: | - set -xe; - ./tools/deployment/baremetal/900-use-it.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" diff --git a/tools/gate/playbooks/multinode-base.yaml b/tools/gate/playbooks/multinode-base.yaml deleted file mode 100644 index 5c29f53eaf..0000000000 --- a/tools/gate/playbooks/multinode-base.yaml +++ /dev/null @@ -1,30 +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: all - tasks: - - name: Ensure pip - include_role: - name: ensure-pip - - name: Override images - include_role: - name: override-images - when: buildset_registry is defined - - name: Use docker mirror - include_role: - name: use-docker-mirror - - name: "creating directory for run artifacts" - file: - path: "/tmp/artifacts" - state: directory -... diff --git a/tools/gate/playbooks/multinode-deploy-cinder.yaml b/tools/gate/playbooks/multinode-deploy-cinder.yaml deleted file mode 100644 index 1c38ee3bd1..0000000000 --- a/tools/gate/playbooks/multinode-deploy-cinder.yaml +++ /dev/null @@ -1,83 +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 - vars_files: - - vars.yaml - tasks: - - name: Setup OS and K8s Clients - environment: "{{ multinode_env }}" - shell: | - set -xe; - ./tools/deployment/multinode/010-setup-client.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Deploy Ingress - environment: "{{ multinode_env }}" - shell: | - set -xe; - ./tools/deployment/component/common/ingress.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" -- hosts: all - vars_files: - - vars.yaml - tasks: - - name: Create loopback devices for CEPH on all nodes - environment: "{{ multinode_env }}" - shell: | - set -xe; - pwd; - ./tools/deployment/common/setup-ceph-loopback-device.sh --ceph-osd-data ${CEPH_OSD_DATA_DEVICE} --ceph-osd-dbwal ${CEPH_OSD_DB_WAL_DEVICE} - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" -- hosts: primary - vars_files: - - vars.yaml - tasks: - - name: Deploy Ceph - environment: "{{ multinode_env }}" - shell: | - set -xe; - ./tools/deployment/multinode/030-ceph.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Setup openstack namespace for ceph - environment: "{{ multinode_env }}" - shell: | - set -xe; - ./tools/deployment/multinode/040-ceph-ns-activate.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Deploy MariaDB RabbitMQ and Memcached - environment: "{{ multinode_env }}" - shell: | - set -xe; - ./tools/deployment/multinode/050-mariadb.sh - ./tools/deployment/multinode/060-rabbitmq.sh - ./tools/deployment/multinode/070-memcached.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Deploy Keystone - environment: "{{ multinode_env }}" - shell: | - set -xe; - ./tools/deployment/multinode/080-keystone.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Deploy Cinder - environment: "{{ multinode_env }}" - shell: | - set -xe; - ./tools/deployment/multinode/110-cinder.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" diff --git a/tools/gate/playbooks/multinode-deploy-compute-kit.yaml b/tools/gate/playbooks/multinode-deploy-compute-kit.yaml deleted file mode 100644 index 17229bf521..0000000000 --- a/tools/gate/playbooks/multinode-deploy-compute-kit.yaml +++ /dev/null @@ -1,84 +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 - vars_files: - - vars.yaml - tasks: - - name: Setup OS and K8s Clients - environment: "{{ multinode_env }}" - shell: | - set -xe; - ./tools/deployment/multinode/010-setup-client.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Deploy Ingress - environment: "{{ multinode_env }}" - shell: | - set -xe; - ./tools/deployment/component/common/ingress.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Deploy MariaDB RabbitMQ and Memcached - environment: "{{ multinode_env }}" - shell: | - set -xe; - ./tools/deployment/multinode/050-mariadb.sh - ./tools/deployment/multinode/060-rabbitmq.sh - ./tools/deployment/multinode/070-memcached.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Deploy NFS and Keystone - environment: "{{ multinode_env }}" - shell: | - set -xe; - ./tools/deployment/multinode/045-nfs-provisioner.sh - ./tools/deployment/multinode/080-keystone.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Deploy Glance Heat and OpenVswitch - environment: "{{ multinode_env }}" - shell: | - set -xe; - ./tools/deployment/multinode/100-glance.sh - ./tools/deployment/multinode/150-heat.sh - ./tools/deployment/multinode/120-openvswitch.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Deploy Libvirt - environment: "{{ multinode_env }}" - shell: | - set -xe; - ./tools/deployment/multinode/130-libvirt.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Deploy ComputeKit - environment: "{{ multinode_env }}" - shell: | - set -xe; - ./tools/deployment/multinode/140-compute-kit.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Deploy Horizon - environment: "{{ multinode_env }}" - shell: | - set -xe; - ./tools/deployment/multinode/085-horizon.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - - name: Exercise the Cloud - environment: "{{ multinode_env }}" - shell: | - set -xe; - ./tools/deployment/multinode/900-use-it.sh - args: - chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" diff --git a/tools/gate/playbooks/multinode-tempest-deploy.yaml b/tools/gate/playbooks/multinode-tempest-deploy.yaml deleted file mode 100644 index 24c7ca2a28..0000000000 --- a/tools/gate/playbooks/multinode-tempest-deploy.yaml +++ /dev/null @@ -1,112 +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: Setup OS and K8s Clients - shell: | - set -xe; - ./tools/deployment/multinode/010-setup-client.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Ingress - environment: - OSH_DEPLOY_MULTINODE: True - shell: | - set -xe; - ./tools/deployment/component/common/ingress.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Ceph - shell: | - set -xe; - ./tools/deployment/multinode/030-ceph.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Setup openstack namespace for ceph - shell: | - set -xe; - ./tools/deployment/multinode/040-ceph-ns-activate.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy MariaDB - shell: | - set -xe; - ./tools/deployment/multinode/050-mariadb.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy RabbitMQ - shell: | - set -xe; - ./tools/deployment/multinode/060-rabbitmq.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Memcached - shell: | - set -xe; - ./tools/deployment/multinode/070-memcached.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Keystone - shell: | - set -xe; - ./tools/deployment/multinode/080-keystone.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Keystone RadosGW endpoints and user - shell: | - set -xe; - ./tools/deployment/multinode/090-ceph-radosgateway.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Glance - shell: | - set -xe; - ./tools/deployment/multinode/100-glance.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Cinder - shell: | - set -xe; - ./tools/deployment/multinode/110-cinder.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy OpenVswitch - shell: | - set -xe; - ./tools/deployment/multinode/120-openvswitch.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Libvirt - shell: | - set -xe; - ./tools/deployment/multinode/130-libvirt.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy ComputeKit - shell: | - set -xe; - ./tools/deployment/multinode/140-compute-kit.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Heat - shell: | - set -xe; - ./tools/deployment/multinode/150-heat.sh - args: - chdir: "{{ zuul.project.src_dir }}" - - name: Deploy Tempest - shell: | - set -xe; - ./tools/deployment/multinode/900-tempest.sh - args: - chdir: "{{ zuul.project.src_dir }}" diff --git a/tools/gate/playbooks/osh-infra-build.yaml b/tools/gate/playbooks/osh-infra-build.yaml deleted file mode 100644 index bd150846f0..0000000000 --- a/tools/gate/playbooks/osh-infra-build.yaml +++ /dev/null @@ -1,34 +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 - vars_files: - - vars.yaml - vars: - work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}" - gather_facts: True - roles: - - build-helm-packages - tags: - - build-helm-packages - -- hosts: all - vars_files: - - vars.yaml - vars: - work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}" - gather_facts: False - become: yes - roles: - - build-images - tags: - - build-images diff --git a/tools/gate/playbooks/osh-infra-deploy-docker.yaml b/tools/gate/playbooks/osh-infra-deploy-docker.yaml deleted file mode 100644 index 7de83a377b..0000000000 --- a/tools/gate/playbooks/osh-infra-deploy-docker.yaml +++ /dev/null @@ -1,41 +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: all - vars_files: - - vars.yaml - vars: - work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}" - gather_facts: False - become: yes - roles: - - deploy-python - tags: - - deploy-python - -- hosts: all - vars_files: - - vars.yaml - vars: - work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}" - gather_facts: True - become: yes - roles: - - setup-firewall - - deploy-python-pip - - deploy-docker - - deploy-jq - tags: - - setup-firewall - - deploy-python-pip - - deploy-docker - - deploy-jq diff --git a/tools/gate/playbooks/osh-infra-deploy-k8s.yaml b/tools/gate/playbooks/osh-infra-deploy-k8s.yaml deleted file mode 100644 index 34e7d38f9b..0000000000 --- a/tools/gate/playbooks/osh-infra-deploy-k8s.yaml +++ /dev/null @@ -1,42 +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 - vars_files: - - vars.yaml - vars: - work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}" - gather_facts: True - roles: - - build-helm-packages - tags: - - build-helm-packages - -- hosts: primary - vars_files: - - vars.yaml - vars: - work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}" - roles: - - deploy-kubeadm-aio-master - tags: - - deploy-kube-master - -- hosts: nodes - vars_files: - - vars.yaml - vars: - work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}" - roles: - - deploy-kubeadm-aio-node - tags: - - deploy-kube-nodes diff --git a/tools/gate/playbooks/osh-infra-setup-firewall.yaml b/tools/gate/playbooks/osh-infra-setup-firewall.yaml deleted file mode 100644 index 58b2325586..0000000000 --- a/tools/gate/playbooks/osh-infra-setup-firewall.yaml +++ /dev/null @@ -1,23 +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: all - vars_files: - - vars.yaml - vars: - work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}" - gather_facts: True - become: yes - roles: - - setup-firewall - tags: - - setup-firewall diff --git a/tools/gate/playbooks/osh-infra-upgrade-host.yaml b/tools/gate/playbooks/osh-infra-upgrade-host.yaml deleted file mode 100644 index 73696f96d0..0000000000 --- a/tools/gate/playbooks/osh-infra-upgrade-host.yaml +++ /dev/null @@ -1,51 +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: all - vars_files: - - vars.yaml - vars: - work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}" - gather_facts: False - become: yes - roles: - - deploy-python - tags: - - deploy-python - -- hosts: all - vars_files: - - vars.yaml - vars: - work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}" - gather_facts: True - become: yes - roles: - - upgrade-host - - start-zuul-console - - disable-local-nameserver - tags: - - upgrade-host - - start-zuul-console - - disable-local-nameserver - -- hosts: all - vars_files: - - vars.yaml - vars: - work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}" - gather_facts: False - become: yes - roles: - - deploy-apparmor - tags: - - deploy-apparmor diff --git a/tools/gate/playbooks/vars.yaml b/tools/gate/playbooks/vars.yaml deleted file mode 100644 index 81b0e17d84..0000000000 --- a/tools/gate/playbooks/vars.yaml +++ /dev/null @@ -1,23 +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. - -multinode_env: - OSH_DEPLOY_MULTINODE: True - OPENSTACK_RELEASE: "{{ osh_params.openstack_release | default('') }}" - CONTAINER_DISTRO_NAME: "{{ osh_params.container_distro_name | default('') }}" - CONTAINER_DISTRO_VERSION: "{{ osh_params.container_distro_version | default('') }}" - FEATURE_GATES: "{{ osh_params.feature_gates | default('') }}" - OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" - OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}" - zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" - CEPH_OSD_DATA_DEVICE: "{{ ceph_osd_data_device | default('/dev/loop0') }}" - CEPH_OSD_DB_WAL_DEVICE: "{{ ceph_osd_db_wal_device | default('/dev/loop1') }}" diff --git a/tools/gate/playbooks/zuul-linter.yaml b/tools/gate/playbooks/zuul-linter.yaml deleted file mode 100644 index 3e9f0710cf..0000000000 --- a/tools/gate/playbooks/zuul-linter.yaml +++ /dev/null @@ -1,18 +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: Execute a Whitespace Linter check - command: find . -not -path "*/\.*" -not -path "*/doc/build/*" -not -name "*.tgz" -type f -exec egrep -l " +$" {} \; - register: result - failed_when: result.stdout != "" diff --git a/tools/overrides/backends/networking/linuxbridge.yaml b/tools/overrides/backends/networking/linuxbridge.yaml deleted file mode 100644 index 1998ffaa17..0000000000 --- a/tools/overrides/backends/networking/linuxbridge.yaml +++ /dev/null @@ -1,20 +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. - -# Values for neutron using Linux Bridge. -# This file contains overrides to launch a MVP deployment of neutron and nova -# using Linux Bridge for the OpenStack-Helm gates, and local development use. -# It should be kept to the bare minimum required for this purpose. - -network: - backend: - - linuxbridge diff --git a/zuul.d/2023.1.yaml b/zuul.d/2023.1.yaml index b19bf03454..260ab21be8 100644 --- a/zuul.d/2023.1.yaml +++ b/zuul.d/2023.1.yaml @@ -136,7 +136,7 @@ - job: name: openstack-helm-apparmor-compute-kit-2023-1-ubuntu_focal - parent: openstack-helm-apparmor-compute-kit + parent: openstack-helm-compute-kit nodeset: openstack-helm-1node-32GB-ubuntu_focal vars: osh_params: @@ -147,7 +147,7 @@ - job: name: openstack-helm-apparmor-cinder-2023-1-ubuntu_focal - parent: openstack-helm-apparmor-cinder + parent: openstack-helm-cinder nodeset: openstack-helm-1node-ubuntu_focal vars: osh_params: diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index f9a80e2cff..91c6d22f5d 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -80,8 +80,8 @@ - ./tools/deployment/common/run-helm-tests.sh nova - ./tools/deployment/common/run-helm-tests.sh glance - ./tools/deployment/common/run-helm-tests.sh keystone - - ./tools/deployment/developer/common/170-setup-gateway.sh - - ./tools/deployment/developer/common/900-use-it.sh + - ./tools/deployment/common/setup-gateway.sh + - ./tools/deployment/common/use-it.sh - ./tools/deployment/common/force-cronjob-run.sh - job: @@ -95,7 +95,7 @@ gate_scripts: - ./tools/deployment/common/prepare-k8s.sh - ./tools/deployment/common/setup-client.sh - - ./tools/scripts/tls/cert-manager.sh + - ./tools/deployment/common/cert-manager.sh - ./tools/deployment/component/common/ingress.sh - ./tools/deployment/component/common/mariadb.sh - ./tools/deployment/component/common/memcached.sh @@ -142,10 +142,10 @@ - ^tools/deployment/common/setup-client.sh$ - ^tools/deployment/component/common/ingress.sh$ - ^tools/deployment/component/common/openstack.sh$ - - ^tools/deployment/developer/common/170-setup-gateway.sh$ - - ^tools/deployment/developer/common/900-use-it.sh$ - - ^tools/gate/tests/validate-umbrella-upgrade-no-side-effects.sh$ - - ^tools/gate/tests/validate-umbrella-upgrade-config-changes-do-not-update-other-components.sh$ + - ^tools/deployment/common/setup-gateway.sh$ + - ^tools/deployment/common/use-it.sh$ + - ^tools/deployment/common/validate-umbrella-upgrade-no-side-effects.sh$ + - ^tools/deployment/common/validate-umbrella-upgrade-config-changes-do-not-update-other-components.sh$ - ^zuul\.d/.*$ vars: run_helm_tests: "yes" @@ -154,11 +154,11 @@ - ./tools/deployment/common/setup-client.sh - ./tools/deployment/component/common/ingress.sh - export GLANCE_BACKEND=memory; ./tools/deployment/component/common/openstack.sh - - ./tools/deployment/developer/common/170-setup-gateway.sh - - - ./tools/deployment/developer/common/900-use-it.sh + - ./tools/deployment/common/setup-gateway.sh + - - ./tools/deployment/common/use-it.sh - ./tools/deployment/common/force-cronjob-run.sh - - ./tools/gate/tests/validate-umbrella-upgrade-no-side-effects.sh - - ./tools/gate/tests/validate-umbrella-upgrade-config-changes-do-not-update-other-components.sh + - ./tools/deployment/common/validate-umbrella-upgrade-no-side-effects.sh + - ./tools/deployment/common/validate-umbrella-upgrade-config-changes-do-not-update-other-components.sh - job: name: openstack-helm-horizon @@ -187,7 +187,7 @@ gate_scripts: - ./tools/deployment/common/prepare-k8s.sh - ./tools/deployment/common/setup-client.sh - - ./tools/scripts/tls/cert-manager.sh + - ./tools/deployment/common/cert-manager.sh - ./tools/deployment/component/ceph/ceph.sh - ./tools/deployment/component/ceph/ceph-ns-activate.sh - ./tools/deployment/component/common/ingress.sh @@ -206,52 +206,10 @@ ./tools/deployment/common/run-helm-tests.sh glance; ./tools/deployment/common/run-helm-tests.sh keystone; ./tools/deployment/common/run-helm-tests.sh cinder; - - ./tools/deployment/developer/common/170-setup-gateway.sh - - - ./tools/deployment/developer/common/900-use-it.sh + - ./tools/deployment/common/setup-gateway.sh + - - ./tools/deployment/common/use-it.sh - ./tools/deployment/common/force-cronjob-run.sh -- job: - name: openstack-helm-apparmor-compute-kit - parent: openstack-helm-deploy - abstract: true - timeout: 9600 - vars: - gate_scripts: - - ./tools/deployment/common/prepare-k8s.sh - - ./tools/deployment/common/setup-client.sh - - ./tools/deployment/apparmor/015-ingress.sh - - ./tools/deployment/component/common/mariadb.sh - - ./tools/deployment/component/common/memcached.sh - - ./tools/deployment/component/common/rabbitmq.sh - - ./tools/deployment/component/keystone/keystone.sh - - ./tools/deployment/component/horizon/horizon.sh - - ./tools/deployment/component/heat/heat.sh - - export GLANCE_BACKEND=memory; ./tools/deployment/component/glance/glance.sh - - ./tools/deployment/component/compute-kit/openvswitch.sh - - ./tools/deployment/component/compute-kit/libvirt.sh - - ./tools/deployment/developer/nfs/160-compute-kit.sh - - ./tools/deployment/component/barbican/barbican.sh - - ./tools/deployment/developer/common/170-setup-gateway.sh - - ./tools/deployment/developer/common/900-use-it.sh - -- job: - name: openstack-helm-apparmor-cinder - parent: openstack-helm-deploy - abstract: true - timeout: 9600 - vars: - gate_scripts: - - ./tools/deployment/common/prepare-k8s.sh - - ./tools/deployment/common/setup-client.sh - - ./tools/deployment/component/ceph/ceph.sh - - ./tools/deployment/component/ceph/ceph-ns-activate.sh - - ./tools/deployment/apparmor/015-ingress.sh - - ./tools/deployment/component/common/mariadb.sh - - ./tools/deployment/component/common/memcached.sh - - ./tools/deployment/component/common/rabbitmq.sh - - ./tools/deployment/component/keystone/keystone.sh - - ./tools/deployment/component/cinder/cinder.sh - - job: name: openstack-helm-tungsten-fabric parent: openstack-helm-deploy @@ -300,10 +258,10 @@ - ./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/common/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/use-it.sh - ./tools/deployment/common/test-networkpolicy.sh - job: @@ -340,10 +298,9 @@ timeout: 7200 vars: 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/prepare-k8s.sh + - ./tools/deployment/common/setup-client.sh + - ./tools/deployment/component/common/ingress.sh - - ./tools/deployment/component/common/rabbitmq.sh - ./tools/deployment/component/common/mariadb.sh - ./tools/deployment/component/common/memcached.sh