From 79dce5eec520ff195ad0b1d46abe989e423e7091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= Date: Tue, 9 Apr 2019 16:09:12 +0200 Subject: [PATCH] Provide release specific overrides file for Neutron 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 --- neutron/values_overrides/rocky.yaml | 9 +++++++++ tools/deployment/multinode/140-compute-kit.sh | 9 +++++++++ 2 files changed, 18 insertions(+) create mode 100644 neutron/values_overrides/rocky.yaml diff --git a/neutron/values_overrides/rocky.yaml b/neutron/values_overrides/rocky.yaml new file mode 100644 index 0000000000..f08f676270 --- /dev/null +++ b/neutron/values_overrides/rocky.yaml @@ -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 diff --git a/tools/deployment/multinode/140-compute-kit.sh b/tools/deployment/multinode/140-compute-kit.sh index b095941c1e..43059f925e 100755 --- a/tools/deployment/multinode/140-compute-kit.sh +++ b/tools/deployment/multinode/140-compute-kit.sh @@ -88,9 +88,18 @@ conf: ovs: bridge_mappings: public:br-ex 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 \ --namespace=openstack \ --values=/tmp/neutron.yaml \ + ${OSH_RELEASE_OVERRIDES_NEUTRON} \ ${OSH_EXTRA_HELM_ARGS} \ ${OSH_EXTRA_HELM_ARGS_NEUTRON}