openstack/openstack-helm
Code Issues Proposed changes

Remove outdated overrides for glance

Browse Source 
The deployment scripts for glance have leftover value settings
from older openstack releases that are no longer supported by
OSH. This change removes those random override values and has
them fallback to the get-values-overrides script.

Change-Id: If348d8be9748c281be27bdf5e8ac37d240d72636
This commit is contained in:
Gage Hugo 2021-11-30 20:12:40 -06:00
parent 09b453e488
commit c0bdc96c40
3 changed files with 0 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/deployment/component/glance/glance.sh
View File

@ -23,29 +23,12 @@ make glance
#NOTE: Deploy command #NOTE: Deploy command
: ${OSH_EXTRA_HELM_ARGS:=""} : ${OSH_EXTRA_HELM_ARGS:=""}
: ${OSH_OPENSTACK_RELEASE:="ocata"}
: ${GLANCE_BACKEND:="pvc"} : ${GLANCE_BACKEND:="pvc"}
tee /tmp/glance.yaml <<EOF tee /tmp/glance.yaml <<EOF
storage: ${GLANCE_BACKEND} storage: ${GLANCE_BACKEND}
volume: volume:
class_name: standard class_name: standard
EOF EOF
if [ "x${OSH_OPENSTACK_RELEASE}" == "xnewton" ]; then
# NOTE(portdirect): glance APIv1 is required for heat in Newton
tee -a /tmp/glance.yaml <<EOF
conf:
glance:
DEFAULT:
enable_v1_api: true
enable_v2_registry: true
manifests:
deployment_registry: true
ingress_registry: true
pdb_registry: true
service_ingress_registry: true
service_registry: true
EOF
fi
helm upgrade --install glance ./glance \ helm upgrade --install glance ./glance \
--namespace=openstack \ --namespace=openstack \
--values=/tmp/glance.yaml \ --values=/tmp/glance.yaml \

25
tools/deployment/developer/ceph/120-glance.sh
View File

@ -14,37 +14,14 @@
set -xe set -xe
#NOTE: Lint and package chart
make glance make glance
#NOTE: Deploy command
: ${OSH_EXTRA_HELM_ARGS:=""} : ${OSH_EXTRA_HELM_ARGS:=""}
: ${OSH_OPENSTACK_RELEASE:="newton"}
#NOTE(portdirect), this could be: radosgw, rbd, swift or pvc
: ${GLANCE_BACKEND:="swift"} : ${GLANCE_BACKEND:="swift"}
#NOTE: Get the over-rides to use
: ${OSH_EXTRA_HELM_ARGS_GLANCE:="$(./tools/deployment/common/get-values-overrides.sh glance)"} : ${OSH_EXTRA_HELM_ARGS_GLANCE:="$(./tools/deployment/common/get-values-overrides.sh glance)"}
tee /tmp/glance.yaml <<EOF tee /tmp/glance.yaml <<EOF
storage: ${GLANCE_BACKEND} storage: ${GLANCE_BACKEND}
EOF EOF
if [ "x${OSH_OPENSTACK_RELEASE}" == "xnewton" ]; then
# NOTE(portdirect): glance APIv1 is required for heat in Newton
tee -a /tmp/glance.yaml <<EOF
conf:
glance:
DEFAULT:
enable_v1_api: true
enable_v2_registry: true
manifests:
deployment_registry: true
ingress_registry: true
pdb_registry: true
service_ingress_registry: true
service_registry: true
EOF
fi
helm upgrade --install glance ./glance \ helm upgrade --install glance ./glance \
--namespace=openstack \ --namespace=openstack \
--values=/tmp/glance.yaml \ --values=/tmp/glance.yaml \
@ -52,10 +29,8 @@ helm upgrade --install glance ./glance \
${OSH_EXTRA_HELM_ARGS} \ ${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_GLANCE} ${OSH_EXTRA_HELM_ARGS_GLANCE}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack ./tools/deployment/common/wait-for-pods.sh openstack
#NOTE: Validate Deployment info
export OS_CLOUD=openstack_helm export OS_CLOUD=openstack_helm
openstack service list openstack service list
sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx

17
tools/deployment/developer/nfs/120-glance.sh
View File

@ -22,27 +22,10 @@ make glance
#NOTE: Deploy command #NOTE: Deploy command
: ${OSH_EXTRA_HELM_ARGS:=""} : ${OSH_EXTRA_HELM_ARGS:=""}
: ${OSH_OPENSTACK_RELEASE:="newton"}
: ${GLANCE_BACKEND:="pvc"} : ${GLANCE_BACKEND:="pvc"}
tee /tmp/glance.yaml <<EOF tee /tmp/glance.yaml <<EOF
storage: ${GLANCE_BACKEND} storage: ${GLANCE_BACKEND}
EOF EOF
if [ "x${OSH_OPENSTACK_RELEASE}" == "xnewton" ]; then
# NOTE(portdirect): glance APIv1 is required for heat in Newton
tee -a /tmp/glance.yaml <<EOF
conf:
glance:
DEFAULT:
enable_v1_api: true
enable_v2_registry: true
manifests:
deployment_registry: true
ingress_registry: true
pdb_registry: true
service_ingress_registry: true
service_registry: true
EOF
fi
helm upgrade --install glance ./glance \ helm upgrade --install glance ./glance \
--namespace=openstack \ --namespace=openstack \
--values=/tmp/glance.yaml \ --values=/tmp/glance.yaml \