openstack/openstack-helm
Code Issues Proposed changes

Update default overrides for openstack and ubuntu

Browse Source 
By default when deploying the openstack AIO, it will deploy
openstack ocata release on ubuntu xenial, which by now is quite
old and largely unsupported. This change updates these default
overrides to train and bionic respectively in order to bring
the default settings to more recent/supported releases.

Change-Id: I9b6e1120101767356413b1341828dc8d39bc9b3c
This commit is contained in:
Gage Hugo 2021-02-01 17:40:50 -06:00
parent 2a9e91589d
commit 01a1ab2ecc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/deployment/common/get-values-overrides.sh
View File

@ -21,9 +21,9 @@
set -e set -e
HELM_CHART="$1" HELM_CHART="$1"
: "${HELM_CHART_ROOT_PATH:="../openstack-helm"}" : "${HELM_CHART_ROOT_PATH:="../openstack-helm"}"
: "${OPENSTACK_RELEASE:="ocata"}" : "${OPENSTACK_RELEASE:="train"}"
: "${CONTAINER_DISTRO_NAME:="ubuntu"}" : "${CONTAINER_DISTRO_NAME:="ubuntu"}"
: "${CONTAINER_DISTRO_VERSION:="xenial"}" : "${CONTAINER_DISTRO_VERSION:="bionic"}"
: "${FEATURE_GATES:=""}" : "${FEATURE_GATES:=""}"
OSH_FEATURE_MIX="${FEATURE_GATES},${OPENSTACK_RELEASE},${CONTAINER_DISTRO_NAME}_${CONTAINER_DISTRO_VERSION},${CONTAINER_DISTRO_NAME}" OSH_FEATURE_MIX="${FEATURE_GATES},${OPENSTACK_RELEASE},${CONTAINER_DISTRO_NAME}_${CONTAINER_DISTRO_VERSION},${CONTAINER_DISTRO_NAME}"

2
tools/deployment/developer/common/170-setup-gateway.sh
View File

@ -19,7 +19,7 @@ set -xe
sudo ip addr add ${OSH_BR_EX_ADDR} dev br-ex sudo ip addr add ${OSH_BR_EX_ADDR} dev br-ex
sudo ip link set br-ex up sudo ip link set br-ex up
: ${DNSMASQ_IMAGE:=docker.io/openstackhelm/neutron:ocata} : ${DNSMASQ_IMAGE:=docker.io/openstackhelm/neutron:train-ubuntu_bionic}
# NOTE(portdirect): With Docker >= 1.13.1 the default FORWARD chain policy is # NOTE(portdirect): With Docker >= 1.13.1 the default FORWARD chain policy is
# configured to DROP, for the l3 agent to function as expected and for # configured to DROP, for the l3 agent to function as expected and for