From 280da524253b1847ca77abc06f35ffde851f6184 Mon Sep 17 00:00:00 2001 From: "rajesh.kudaka" Date: Wed, 18 Mar 2020 09:43:31 +0000 Subject: [PATCH] Disable seperate placement deployment in stein This commit is to deploy placement service as a part of nova chart for stein release. This also enables seperate placement chart deployment for train release. Change-Id: Ie22dbf85a3ed42bc0cd13579218e03d5912e67ea --- nova/templates/netpol-placement.yaml | 2 ++ ...va-placement.yaml => train-disable-nova-placement.yaml} | 0 tools/deployment/component/compute-kit/compute-kit.sh | 7 +++++-- 3 files changed, 7 insertions(+), 2 deletions(-) rename nova/values_overrides/{stein-disable-nova-placement.yaml => train-disable-nova-placement.yaml} (100%) diff --git a/nova/templates/netpol-placement.yaml b/nova/templates/netpol-placement.yaml index 110621464c..aca916b30c 100644 --- a/nova/templates/netpol-placement.yaml +++ b/nova/templates/netpol-placement.yaml @@ -15,6 +15,8 @@ limitations under the License. */}} {{- if .Values.manifests.network_policy -}} +{{- if .Values.manifests.deployment_placement -}} {{- $netpol_opts := dict "envAll" . "name" "application" "label" "placement" }} {{ $netpol_opts | include "helm-toolkit.manifests.kubernetes_network_policy" }} {{- end -}} +{{- end -}} diff --git a/nova/values_overrides/stein-disable-nova-placement.yaml b/nova/values_overrides/train-disable-nova-placement.yaml similarity index 100% rename from nova/values_overrides/stein-disable-nova-placement.yaml rename to nova/values_overrides/train-disable-nova-placement.yaml diff --git a/tools/deployment/component/compute-kit/compute-kit.sh b/tools/deployment/component/compute-kit/compute-kit.sh index d78b96a334..afb7baf672 100755 --- a/tools/deployment/component/compute-kit/compute-kit.sh +++ b/tools/deployment/component/compute-kit/compute-kit.sh @@ -32,6 +32,9 @@ case "${OPENSTACK_RELEASE}" in "rocky") DEPLOY_SEPARATE_PLACEMENT="no" ;; + "stein") + DEPLOY_SEPARATE_PLACEMENT="no" + ;; *) DEPLOY_SEPARATE_PLACEMENT="yes" ;; @@ -55,10 +58,10 @@ fi # TODO: Revert this reasoning when gates are pointing to more up to # date openstack release. When doing so, we should revert the default # values of the nova chart to NOT use placement by default, and -# have a ocata/pike/queens/rocky override to enable placement in the nova chart deploy +# have a ocata/pike/queens/rocky/stein override to enable placement in the nova chart deploy if [[ "${DEPLOY_SEPARATE_PLACEMENT}" == "yes" ]]; then - OSH_EXTRA_HELM_ARGS_NOVA="${OSH_EXTRA_HELM_ARGS_NOVA} --values=./nova/values_overrides/stein-disable-nova-placement.yaml" + OSH_EXTRA_HELM_ARGS_NOVA="${OSH_EXTRA_HELM_ARGS_NOVA} --values=./nova/values_overrides/train-disable-nova-placement.yaml" fi #NOTE: Lint and package chart