From f2108855f52173ffef6bab2316a16cece6ca7903 Mon Sep 17 00:00:00 2001 From: Gage Hugo Date: Sun, 10 Oct 2021 18:26:02 -0500 Subject: [PATCH] Remove helm status from deployment scripts With the move to helm v3, helm status requires a namespace to be specified, but doing so breaks helm v2 compatability. In order to preserve our gating with both versions of helm while we make the change from v2 to v3, this change removes the usage of helm serve in openstack-helm's deployment scripts. Once we fully move to helm v3, these scripts can be improved and cleaned up to be more compatible with the new v3 syntax. Change-Id: I02b6bbf780abf8c8bc7c1783c35d9411d25e18a8 --- tools/deployment/apparmor/015-ingress.sh | 9 --------- tools/deployment/baremetal/005-setup-nodes.sh | 6 ------ tools/deployment/baremetal/020-ingress.sh | 5 ----- tools/deployment/common/lockdown-netpol.sh | 3 --- tools/deployment/common/memcached.sh | 3 --- tools/deployment/common/openstack-exporter.sh | 3 --- tools/deployment/component/barbican/barbican.sh | 3 --- tools/deployment/component/common/ingress.sh | 9 --------- tools/deployment/component/common/mariadb.sh | 3 --- tools/deployment/component/common/memcached.sh | 3 --- tools/deployment/component/common/rabbitmq.sh | 3 --- tools/deployment/component/compute-kit/libvirt.sh | 6 ------ tools/deployment/component/compute-kit/openvswitch.sh | 3 --- tools/deployment/component/glance/glance.sh | 2 -- tools/deployment/component/horizon/horizon.sh | 3 --- tools/deployment/component/keystone/keystone.sh | 2 -- .../component/nfs-provisioner/nfs-provisioner.sh | 3 --- tools/deployment/developer/ceph/110-ceph-radosgateway.sh | 1 - tools/deployment/developer/ceph/120-glance.sh | 1 - tools/deployment/developer/ceph/150-libvirt.sh | 6 ------ tools/deployment/developer/common/050-mariadb.sh | 3 --- tools/deployment/developer/common/060-rabbitmq.sh | 3 --- tools/deployment/developer/common/080-keystone.sh | 1 - tools/deployment/developer/common/085-barbican.sh | 3 --- tools/deployment/developer/common/100-horizon.sh | 3 --- tools/deployment/developer/common/140-openvswitch.sh | 3 --- tools/deployment/developer/ldap/080-keystone.sh | 4 ---- tools/deployment/developer/nfs/040-nfs-provisioner.sh | 3 --- tools/deployment/developer/nfs/120-glance.sh | 1 - tools/deployment/developer/nfs/150-libvirt.sh | 6 ------ tools/deployment/multinode/040-ceph-ns-activate.sh | 3 --- tools/deployment/multinode/050-mariadb.sh | 3 --- tools/deployment/multinode/080-keystone.sh | 1 - tools/deployment/multinode/085-horizon.sh | 3 --- tools/deployment/multinode/090-ceph-radosgateway.sh | 3 --- tools/deployment/multinode/100-glance.sh | 1 - tools/deployment/multinode/120-openvswitch.sh | 3 --- tools/deployment/multinode/130-libvirt.sh | 6 ------ tools/deployment/multinode/250-aodh.sh | 1 - 39 files changed, 131 deletions(-) diff --git a/tools/deployment/apparmor/015-ingress.sh b/tools/deployment/apparmor/015-ingress.sh index 65bb065b..9b41f314 100755 --- a/tools/deployment/apparmor/015-ingress.sh +++ b/tools/deployment/apparmor/015-ingress.sh @@ -47,9 +47,6 @@ helm upgrade --install ingress-kube-system ${HELM_CHART_ROOT_PATH}/ingress \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh kube-system -#NOTE: Display info -helm status ingress-kube-system - #NOTE: Deploy namespace ingress helm upgrade --install ingress-osh-infra ${HELM_CHART_ROOT_PATH}/ingress \ --namespace=osh-infra \ @@ -59,9 +56,6 @@ helm upgrade --install ingress-osh-infra ${HELM_CHART_ROOT_PATH}/ingress \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh osh-infra -#NOTE: Display info -helm status ingress-osh-infra - helm upgrade --install ingress-ceph ${HELM_CHART_ROOT_PATH}/ingress \ --namespace=ceph \ ${OSH_INFRA_EXTRA_HELM_ARGS} \ @@ -69,6 +63,3 @@ helm upgrade --install ingress-ceph ${HELM_CHART_ROOT_PATH}/ingress \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh ceph - -#NOTE: Display info -helm status ingress-ceph diff --git a/tools/deployment/baremetal/005-setup-nodes.sh b/tools/deployment/baremetal/005-setup-nodes.sh index b864769a..70d2fe3e 100755 --- a/tools/deployment/baremetal/005-setup-nodes.sh +++ b/tools/deployment/baremetal/005-setup-nodes.sh @@ -38,9 +38,6 @@ helm install ${OSH_INFRA_PATH}/libvirt \ sleep 5 #NOTE(portdirect): work around k8s not immedately assigning pods to nodes ./tools/deployment/common/wait-for-pods.sh libvirt -#NOTE: Validate Deployment info -helm status libvirt - #NOTE: Create domains and start vbmc for ironic to manage as baremetal nodes LIBVIRT_PODS=$(kubectl get --namespace libvirt pods \ -l application=libvirt,component=libvirt \ @@ -78,9 +75,6 @@ helm install ${OSH_INFRA_PATH}/openvswitch \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack -#NOTE: Validate Deployment info -helm status openvswitch - #NOTE: Setup GRE tunnels between deployment node and libvirt hosts OSH_IRONIC_PXE_DEV="${OSH_IRONIC_PXE_DEV:="ironic-pxe"}" OSH_IRONIC_PXE_ADDR="${OSH_IRONIC_PXE_ADDR:="172.24.6.1/24"}" diff --git a/tools/deployment/baremetal/020-ingress.sh b/tools/deployment/baremetal/020-ingress.sh index 10d52bd4..5d11f476 100755 --- a/tools/deployment/baremetal/020-ingress.sh +++ b/tools/deployment/baremetal/020-ingress.sh @@ -41,8 +41,3 @@ helm install ${OSH_INFRA_PATH}/ingress \ ./tools/deployment/common/wait-for-pods.sh kube-system ./tools/deployment/common/wait-for-pods.sh ceph ./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Display info -helm status ingress-kube-system -helm status ingress-ceph -helm status ingress-openstack diff --git a/tools/deployment/common/lockdown-netpol.sh b/tools/deployment/common/lockdown-netpol.sh index af4c23b0..93d0a2e0 100755 --- a/tools/deployment/common/lockdown-netpol.sh +++ b/tools/deployment/common/lockdown-netpol.sh @@ -29,6 +29,3 @@ helm upgrade --install lockdown ${HELM_CHART_ROOT_PATH}/lockdown \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -helm status lockdown diff --git a/tools/deployment/common/memcached.sh b/tools/deployment/common/memcached.sh index ca68e2a7..fd2cc36b 100755 --- a/tools/deployment/common/memcached.sh +++ b/tools/deployment/common/memcached.sh @@ -30,6 +30,3 @@ helm upgrade --install memcached ${HELM_CHART_ROOT_PATH}/memcached \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -helm status memcached diff --git a/tools/deployment/common/openstack-exporter.sh b/tools/deployment/common/openstack-exporter.sh index 33ed7e1c..b0c2e4f6 100755 --- a/tools/deployment/common/openstack-exporter.sh +++ b/tools/deployment/common/openstack-exporter.sh @@ -29,6 +29,3 @@ helm upgrade --install prometheus-openstack-exporter ${HELM_CHART_ROOT_PATH}/pro #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -helm status prometheus-openstack-exporter diff --git a/tools/deployment/component/barbican/barbican.sh b/tools/deployment/component/barbican/barbican.sh index 212d3369..f6fe8770 100755 --- a/tools/deployment/component/barbican/barbican.sh +++ b/tools/deployment/component/barbican/barbican.sh @@ -29,7 +29,4 @@ helm upgrade --install barbican ./barbican \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack -#NOTE: Validate Deployment info -helm status barbican - helm test barbican diff --git a/tools/deployment/component/common/ingress.sh b/tools/deployment/component/common/ingress.sh index 47b40fa9..278a6e09 100755 --- a/tools/deployment/component/common/ingress.sh +++ b/tools/deployment/component/common/ingress.sh @@ -58,9 +58,6 @@ helm upgrade --install ingress-kube-system ${HELM_CHART_ROOT_PATH}/ingress \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh kube-system -#NOTE: Display info -helm status ingress-kube-system - #NOTE: Deploy namespace ingress helm upgrade --install ingress-openstack ${HELM_CHART_ROOT_PATH}/ingress \ --namespace=openstack \ @@ -72,9 +69,6 @@ helm upgrade --install ingress-openstack ${HELM_CHART_ROOT_PATH}/ingress \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack -#NOTE: Display info -helm status ingress-openstack - helm upgrade --install ingress-ceph ${HELM_CHART_ROOT_PATH}/ingress \ --namespace=ceph \ --values=/tmp/ingress-component.yaml \ @@ -84,6 +78,3 @@ helm upgrade --install ingress-ceph ${HELM_CHART_ROOT_PATH}/ingress \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh ceph - -#NOTE: Display info -helm status ingress-ceph diff --git a/tools/deployment/component/common/mariadb.sh b/tools/deployment/component/common/mariadb.sh index b3237e84..f00ff03b 100755 --- a/tools/deployment/component/common/mariadb.sh +++ b/tools/deployment/component/common/mariadb.sh @@ -33,6 +33,3 @@ helm upgrade --install mariadb ${HELM_CHART_ROOT_PATH}/mariadb \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -helm status mariadb diff --git a/tools/deployment/component/common/memcached.sh b/tools/deployment/component/common/memcached.sh index ba32c714..961d19b3 100755 --- a/tools/deployment/component/common/memcached.sh +++ b/tools/deployment/component/common/memcached.sh @@ -30,6 +30,3 @@ helm upgrade --install memcached ${HELM_CHART_ROOT_PATH}/memcached \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -helm status memcached diff --git a/tools/deployment/component/common/rabbitmq.sh b/tools/deployment/component/common/rabbitmq.sh index 4e4d63c8..8e5f7ad7 100755 --- a/tools/deployment/component/common/rabbitmq.sh +++ b/tools/deployment/component/common/rabbitmq.sh @@ -31,6 +31,3 @@ helm upgrade --install rabbitmq ${HELM_CHART_ROOT_PATH}/rabbitmq \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -helm status rabbitmq diff --git a/tools/deployment/component/compute-kit/libvirt.sh b/tools/deployment/component/compute-kit/libvirt.sh index 874d1a99..7e5ceea0 100755 --- a/tools/deployment/component/compute-kit/libvirt.sh +++ b/tools/deployment/component/compute-kit/libvirt.sh @@ -34,9 +34,3 @@ helm upgrade --install libvirt ${HELM_CHART_ROOT_PATH}/libvirt \ --set conf.ceph.enabled=${CEPH_ENABLED} \ ${OSH_EXTRA_HELM_ARGS:=} \ ${OSH_EXTRA_HELM_ARGS_LIBVIRT} - -#NOTE(portdirect): We don't wait for libvirt pods to come up, as they depend -# on the neutron agents being up. - -#NOTE: Validate Deployment info -helm status libvirt diff --git a/tools/deployment/component/compute-kit/openvswitch.sh b/tools/deployment/component/compute-kit/openvswitch.sh index 914e6be2..0b7f9ef4 100755 --- a/tools/deployment/component/compute-kit/openvswitch.sh +++ b/tools/deployment/component/compute-kit/openvswitch.sh @@ -28,6 +28,3 @@ helm upgrade --install openvswitch ${HELM_CHART_ROOT_PATH}/openvswitch \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -helm status openvswitch diff --git a/tools/deployment/component/glance/glance.sh b/tools/deployment/component/glance/glance.sh index 60a59ad7..31a32ea2 100755 --- a/tools/deployment/component/glance/glance.sh +++ b/tools/deployment/component/glance/glance.sh @@ -53,8 +53,6 @@ helm upgrade --install glance ./glance \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack -#NOTE: Validate Deployment info -helm status glance export OS_CLOUD=openstack_helm openstack service list sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx diff --git a/tools/deployment/component/horizon/horizon.sh b/tools/deployment/component/horizon/horizon.sh index b311c3c5..bcbf82ac 100755 --- a/tools/deployment/component/horizon/horizon.sh +++ b/tools/deployment/component/horizon/horizon.sh @@ -29,9 +29,6 @@ helm upgrade --install horizon ./horizon \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack -#NOTE: Validate Deployment info -helm status horizon - helm test horizon FEATURE_GATE="tls"; if [[ ${FEATURE_GATES//,/ } =~ (^|[[:space:]])${FEATURE_GATE}($|[[:space:]]) ]]; then diff --git a/tools/deployment/component/keystone/keystone.sh b/tools/deployment/component/keystone/keystone.sh index da985b52..d2449a4f 100755 --- a/tools/deployment/component/keystone/keystone.sh +++ b/tools/deployment/component/keystone/keystone.sh @@ -30,8 +30,6 @@ helm upgrade --install keystone ./keystone \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack -#NOTE: Validate Deployment info -helm status keystone export OS_CLOUD=openstack_helm sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx openstack endpoint list diff --git a/tools/deployment/component/nfs-provisioner/nfs-provisioner.sh b/tools/deployment/component/nfs-provisioner/nfs-provisioner.sh index 5365f0a3..f9d80389 100755 --- a/tools/deployment/component/nfs-provisioner/nfs-provisioner.sh +++ b/tools/deployment/component/nfs-provisioner/nfs-provisioner.sh @@ -23,6 +23,3 @@ helm upgrade --install nfs-provisioner ${OSH_INFRA_PATH}/nfs-provisioner \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh nfs - -#NOTE: Display info -helm status nfs-provisioner diff --git a/tools/deployment/developer/ceph/110-ceph-radosgateway.sh b/tools/deployment/developer/ceph/110-ceph-radosgateway.sh index e584ebf6..bed80433 100755 --- a/tools/deployment/developer/ceph/110-ceph-radosgateway.sh +++ b/tools/deployment/developer/ceph/110-ceph-radosgateway.sh @@ -55,7 +55,6 @@ helm upgrade --install radosgw-openstack ${HELM_CHART_ROOT_PATH}/ceph-rgw \ ./tools/deployment/common/wait-for-pods.sh openstack #NOTE: Validate Deployment info -helm status radosgw-openstack export OS_CLOUD=openstack_helm sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx openstack service list diff --git a/tools/deployment/developer/ceph/120-glance.sh b/tools/deployment/developer/ceph/120-glance.sh index 818a5255..6a75cf16 100755 --- a/tools/deployment/developer/ceph/120-glance.sh +++ b/tools/deployment/developer/ceph/120-glance.sh @@ -56,7 +56,6 @@ helm upgrade --install glance ./glance \ ./tools/deployment/common/wait-for-pods.sh openstack #NOTE: Validate Deployment info -helm status glance export OS_CLOUD=openstack_helm openstack service list sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx diff --git a/tools/deployment/developer/ceph/150-libvirt.sh b/tools/deployment/developer/ceph/150-libvirt.sh index c6d5568d..5fa46eb9 100755 --- a/tools/deployment/developer/ceph/150-libvirt.sh +++ b/tools/deployment/developer/ceph/150-libvirt.sh @@ -26,9 +26,3 @@ helm upgrade --install libvirt ${HELM_CHART_ROOT_PATH}/libvirt \ --namespace=openstack \ ${OSH_EXTRA_HELM_ARGS} \ ${OSH_EXTRA_HELM_ARGS_LIBVIRT} - -#NOTE(portdirect): We don't wait for libvirt pods to come up, as they depend -# on the neutron agents being up. - -#NOTE: Validate Deployment info -helm status libvirt diff --git a/tools/deployment/developer/common/050-mariadb.sh b/tools/deployment/developer/common/050-mariadb.sh index 90cd397c..2356197f 100755 --- a/tools/deployment/developer/common/050-mariadb.sh +++ b/tools/deployment/developer/common/050-mariadb.sh @@ -31,6 +31,3 @@ helm upgrade --install mariadb ${HELM_CHART_ROOT_PATH}/mariadb \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -helm status mariadb diff --git a/tools/deployment/developer/common/060-rabbitmq.sh b/tools/deployment/developer/common/060-rabbitmq.sh index 58e1c326..041625a6 100755 --- a/tools/deployment/developer/common/060-rabbitmq.sh +++ b/tools/deployment/developer/common/060-rabbitmq.sh @@ -30,6 +30,3 @@ helm upgrade --install rabbitmq ${HELM_CHART_ROOT_PATH}/rabbitmq \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -helm status rabbitmq diff --git a/tools/deployment/developer/common/080-keystone.sh b/tools/deployment/developer/common/080-keystone.sh index 39d0485d..ddb2265a 100755 --- a/tools/deployment/developer/common/080-keystone.sh +++ b/tools/deployment/developer/common/080-keystone.sh @@ -31,7 +31,6 @@ helm upgrade --install keystone ./keystone \ ./tools/deployment/common/wait-for-pods.sh openstack #NOTE: Validate Deployment info -helm status keystone export OS_CLOUD=openstack_helm sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx openstack endpoint list diff --git a/tools/deployment/developer/common/085-barbican.sh b/tools/deployment/developer/common/085-barbican.sh index e84acff7..0ee96b88 100755 --- a/tools/deployment/developer/common/085-barbican.sh +++ b/tools/deployment/developer/common/085-barbican.sh @@ -29,9 +29,6 @@ helm upgrade --install barbican ./barbican \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack -#NOTE: Validate Deployment info -helm status barbican - # Delete the test pod if it still exists kubectl delete pods -l application=barbican,release_group=barbican,component=test --namespace=openstack --ignore-not-found helm test barbican diff --git a/tools/deployment/developer/common/100-horizon.sh b/tools/deployment/developer/common/100-horizon.sh index fa7d1653..836434c7 100755 --- a/tools/deployment/developer/common/100-horizon.sh +++ b/tools/deployment/developer/common/100-horizon.sh @@ -32,9 +32,6 @@ helm upgrade --install horizon ./horizon \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack -#NOTE: Validate Deployment info -helm status horizon - # Delete the test pod if it still exists kubectl delete pods -l application=horizon,release_group=horizon,component=test --namespace=openstack --ignore-not-found helm test horizon diff --git a/tools/deployment/developer/common/140-openvswitch.sh b/tools/deployment/developer/common/140-openvswitch.sh index 4cc7d687..8ba97ae3 100755 --- a/tools/deployment/developer/common/140-openvswitch.sh +++ b/tools/deployment/developer/common/140-openvswitch.sh @@ -29,6 +29,3 @@ helm upgrade --install openvswitch ${HELM_CHART_ROOT_PATH}/openvswitch \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -helm status openvswitch diff --git a/tools/deployment/developer/ldap/080-keystone.sh b/tools/deployment/developer/ldap/080-keystone.sh index 99b8ed6c..5b8aa5cf 100755 --- a/tools/deployment/developer/ldap/080-keystone.sh +++ b/tools/deployment/developer/ldap/080-keystone.sh @@ -31,9 +31,6 @@ helm upgrade --install ldap ${HELM_CHART_ROOT_PATH}/ldap \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack -#NOTE: Validate Deployment info -helm status ldap - #NOTE: Get the over-rides to use export HELM_CHART_ROOT_PATH="../openstack-helm" : ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(./tools/deployment/common/get-values-overrides.sh keystone)"} @@ -53,7 +50,6 @@ helm upgrade --install keystone ./keystone \ ./tools/deployment/common/wait-for-pods.sh openstack #NOTE: Validate Deployment info -helm status keystone export OS_CLOUD=openstack_helm sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx openstack endpoint list diff --git a/tools/deployment/developer/nfs/040-nfs-provisioner.sh b/tools/deployment/developer/nfs/040-nfs-provisioner.sh index c4aec020..9ff8d270 100755 --- a/tools/deployment/developer/nfs/040-nfs-provisioner.sh +++ b/tools/deployment/developer/nfs/040-nfs-provisioner.sh @@ -28,6 +28,3 @@ helm upgrade --install nfs-provisioner ${OSH_INFRA_PATH}/nfs-provisioner \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh nfs - -#NOTE: Display info -helm status nfs-provisioner diff --git a/tools/deployment/developer/nfs/120-glance.sh b/tools/deployment/developer/nfs/120-glance.sh index d24e5ccb..ac7caf37 100755 --- a/tools/deployment/developer/nfs/120-glance.sh +++ b/tools/deployment/developer/nfs/120-glance.sh @@ -53,7 +53,6 @@ helm upgrade --install glance ./glance \ ./tools/deployment/common/wait-for-pods.sh openstack #NOTE: Validate Deployment info -helm status glance export OS_CLOUD=openstack_helm openstack service list sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx diff --git a/tools/deployment/developer/nfs/150-libvirt.sh b/tools/deployment/developer/nfs/150-libvirt.sh index 5977f0a0..9ad35e0e 100755 --- a/tools/deployment/developer/nfs/150-libvirt.sh +++ b/tools/deployment/developer/nfs/150-libvirt.sh @@ -27,9 +27,3 @@ helm upgrade --install libvirt ${HELM_CHART_ROOT_PATH}/libvirt \ --set conf.ceph.enabled=false \ ${OSH_EXTRA_HELM_ARGS} \ ${OSH_EXTRA_HELM_ARGS_LIBVIRT} - -#NOTE(portdirect): We don't wait for libvirt pods to come up, as they depend -# on the neutron agents being up. - -#NOTE: Validate Deployment info -helm status libvirt diff --git a/tools/deployment/multinode/040-ceph-ns-activate.sh b/tools/deployment/multinode/040-ceph-ns-activate.sh index ad47e9df..cff11753 100755 --- a/tools/deployment/multinode/040-ceph-ns-activate.sh +++ b/tools/deployment/multinode/040-ceph-ns-activate.sh @@ -46,6 +46,3 @@ helm upgrade --install ceph-openstack-config ${OSH_INFRA_PATH}/ceph-provisioners #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -helm status ceph-openstack-config diff --git a/tools/deployment/multinode/050-mariadb.sh b/tools/deployment/multinode/050-mariadb.sh index 5ba6d44a..21a85672 100755 --- a/tools/deployment/multinode/050-mariadb.sh +++ b/tools/deployment/multinode/050-mariadb.sh @@ -40,6 +40,3 @@ helm upgrade --install mariadb ${HELM_CHART_ROOT_PATH}/mariadb \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -helm status mariadb diff --git a/tools/deployment/multinode/080-keystone.sh b/tools/deployment/multinode/080-keystone.sh index 2cf320ff..0abaa369 100755 --- a/tools/deployment/multinode/080-keystone.sh +++ b/tools/deployment/multinode/080-keystone.sh @@ -33,7 +33,6 @@ helm upgrade --install keystone ./keystone \ ./tools/deployment/common/wait-for-pods.sh openstack #NOTE: Validate Deployment info -helm status keystone export OS_CLOUD=openstack_helm sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx openstack endpoint list diff --git a/tools/deployment/multinode/085-horizon.sh b/tools/deployment/multinode/085-horizon.sh index ec796aa7..dcc882de 100755 --- a/tools/deployment/multinode/085-horizon.sh +++ b/tools/deployment/multinode/085-horizon.sh @@ -39,7 +39,4 @@ helm upgrade --install horizon ./horizon \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack -#NOTE: Validate Deployment info -helm status horizon - helm test horizon diff --git a/tools/deployment/multinode/090-ceph-radosgateway.sh b/tools/deployment/multinode/090-ceph-radosgateway.sh index a9a58164..bca85a79 100755 --- a/tools/deployment/multinode/090-ceph-radosgateway.sh +++ b/tools/deployment/multinode/090-ceph-radosgateway.sh @@ -58,9 +58,6 @@ helm upgrade --install radosgw-openstack ${OSH_INFRA_PATH}/ceph-rgw \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack -#NOTE: Validate Deployment info -helm status radosgw-openstack - #NOTE: Run Tests export OS_CLOUD=openstack_helm # Delete the test pod if it still exists diff --git a/tools/deployment/multinode/100-glance.sh b/tools/deployment/multinode/100-glance.sh index 20bacd23..b9d1dc37 100755 --- a/tools/deployment/multinode/100-glance.sh +++ b/tools/deployment/multinode/100-glance.sh @@ -42,7 +42,6 @@ helm upgrade --install glance ./glance \ ./tools/deployment/common/wait-for-pods.sh openstack #NOTE: Validate Deployment info -helm status glance export OS_CLOUD=openstack_helm openstack service list sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx diff --git a/tools/deployment/multinode/120-openvswitch.sh b/tools/deployment/multinode/120-openvswitch.sh index 889ed064..120c0589 100755 --- a/tools/deployment/multinode/120-openvswitch.sh +++ b/tools/deployment/multinode/120-openvswitch.sh @@ -28,6 +28,3 @@ helm upgrade --install openvswitch ${OSH_INFRA_PATH}/openvswitch \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -helm status openvswitch diff --git a/tools/deployment/multinode/130-libvirt.sh b/tools/deployment/multinode/130-libvirt.sh index c1b84c6a..74cc98e0 100755 --- a/tools/deployment/multinode/130-libvirt.sh +++ b/tools/deployment/multinode/130-libvirt.sh @@ -33,9 +33,3 @@ helm upgrade --install libvirt ${OSH_INFRA_PATH}/libvirt \ --set conf.ceph.enabled=${CEPH_ENABLED} \ ${OSH_EXTRA_HELM_ARGS} \ ${OSH_EXTRA_HELM_ARGS_LIBVIRT} - -#NOTE(portdirect): We don't wait for libvirt pods to come up, as they depend -# on the neutron agents being up. - -#NOTE: Validate Deployment info -helm status libvirt diff --git a/tools/deployment/multinode/250-aodh.sh b/tools/deployment/multinode/250-aodh.sh index 6abedbae..2adb09be 100755 --- a/tools/deployment/multinode/250-aodh.sh +++ b/tools/deployment/multinode/250-aodh.sh @@ -30,6 +30,5 @@ helm upgrade --install aodh ./aodh \ ./tools/deployment/common/wait-for-pods.sh openstack #NOTE: Validate Deployment info -helm status aodh export OS_CLOUD=openstack_helm openstack service list