openstack/openstack-helm
Code Issues Proposed changes

Merge "Disable seperate placement deployment in stein"

Browse Source
This commit is contained in:
Zuul 2020-03-19 16:17:35 +00:00 committed by Gerrit Code Review
commit c7c7ab00bd
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/templates/netpol-placement.yaml
View File

@ -15,6 +15,8 @@ limitations under the License.
*/}} */}}
{{- if .Values.manifests.network_policy -}} {{- if .Values.manifests.network_policy -}}
{{- if .Values.manifests.deployment_placement -}}
{{- $netpol_opts := dict "envAll" . "name" "application" "label" "placement" }} {{- $netpol_opts := dict "envAll" . "name" "application" "label" "placement" }}
{{ $netpol_opts | include "helm-toolkit.manifests.kubernetes_network_policy" }} {{ $netpol_opts | include "helm-toolkit.manifests.kubernetes_network_policy" }}
{{- end -}} {{- end -}}
{{- end -}}

0
nova/values_overrides/stein-disable-nova-placement.yaml → nova/values_overrides/train-disable-nova-placement.yaml
View File

7
tools/deployment/component/compute-kit/compute-kit.sh
View File

@ -32,6 +32,9 @@ case "${OPENSTACK_RELEASE}" in
"rocky") "rocky")
DEPLOY_SEPARATE_PLACEMENT="no" DEPLOY_SEPARATE_PLACEMENT="no"
;; ;;
"stein")
DEPLOY_SEPARATE_PLACEMENT="no"
;;
*) *)
DEPLOY_SEPARATE_PLACEMENT="yes" DEPLOY_SEPARATE_PLACEMENT="yes"
;; ;;
@ -55,10 +58,10 @@ fi
# TODO: Revert this reasoning when gates are pointing to more up to # TODO: Revert this reasoning when gates are pointing to more up to
# date openstack release. When doing so, we should revert the default # date openstack release. When doing so, we should revert the default
# values of the nova chart to NOT use placement by default, and # 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 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 fi
#NOTE: Lint and package chart #NOTE: Lint and package chart