openstack/openstack-helm
Code Issues Proposed changes

Merge "Update default overrides for openstack and ubuntu"

Browse Source
This commit is contained in:
Zuul 2021-03-11 03:53:39 +00:00 committed by Gerrit Code Review
commit c659b0fdd6
2 changed files with 3 additions and 3 deletions
tools/deployment
common
get-values-overrides.sh
developer/common
170-setup-gateway.sh

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

@ -21,9 +21,9 @@
set -e
HELM_CHART="$1"
: "${HELM_CHART_ROOT_PATH:="../openstack-helm"}"
: "${OPENSTACK_RELEASE:="ocata"}"
: "${OPENSTACK_RELEASE:="train"}"
: "${CONTAINER_DISTRO_NAME:="ubuntu"}"
: "${CONTAINER_DISTRO_VERSION:="xenial"}"
: "${CONTAINER_DISTRO_VERSION:="bionic"}"
: "${FEATURE_GATES:=""}"
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

@ -19,7 +19,7 @@ set -xe
sudo ip addr add ${OSH_BR_EX_ADDR} dev br-ex
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
# configured to DROP, for the l3 agent to function as expected and for