openstack/openstack-helm
Code Issues Proposed changes

Provide release specific overrides file for Neutron

Browse Source 
Create the overrides file necessary for Rocky release:
 - api-paste entrypoint neutron.api.versions:Versions.factory deprecated

Deployment script needs to be executed with OSH_OPENSTACK_RELEASE value.

Change-Id: If0d3553bd004426d8e97e1fa62ee9b99f4a895a9
This commit is contained in:
Jiří Suchomel 2019-04-09 16:09:12 +02:00 committed by Tin Lam
parent 02af9df330
commit 79dce5eec5
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
neutron/values_overrides/rocky.yaml Normal file
View File

@ -0,0 +1,9 @@
# Provide release specific overrides for Neutron configuration
# e.g. removal of obsoleted options
conf:
# api-paste entrypoint neutron.api.versions:Versions.factory was deprecated in Queens
# See https://docs.openstack.org/releasenotes/neutron/queens.html:
paste:
app:neutronversions:
paste.app_factory: neutron.pecan_wsgi.app:versions_factory

9
tools/deployment/multinode/140-compute-kit.sh
View File

@ -88,9 +88,18 @@ conf:
ovs: ovs:
bridge_mappings: public:br-ex bridge_mappings: public:br-ex
EOF EOF
if [ -n "$OSH_OPENSTACK_RELEASE" ]; then
if [ -e "./neutron/values_overrides/${OSH_OPENSTACK_RELEASE}.yaml" ] ; then
echo "Adding release overrides for ${OSH_OPENSTACK_RELEASE}"
OSH_RELEASE_OVERRIDES_NEUTRON="--values=./neutron/values_overrides/${OSH_OPENSTACK_RELEASE}.yaml"
fi
fi
helm upgrade --install neutron ./neutron \ helm upgrade --install neutron ./neutron \
--namespace=openstack \ --namespace=openstack \
--values=/tmp/neutron.yaml \ --values=/tmp/neutron.yaml \
${OSH_RELEASE_OVERRIDES_NEUTRON} \
${OSH_EXTRA_HELM_ARGS} \ ${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_NEUTRON} ${OSH_EXTRA_HELM_ARGS_NEUTRON}