From bb8fde8c89d9067dc475c6cb2e95b4bbacf6ab27 Mon Sep 17 00:00:00 2001 From: Edward Hope-Morley Date: Fri, 17 Nov 2023 10:59:41 +0000 Subject: [PATCH] Add prodstack6 profile --- openstack/profiles/default | 3 ++- openstack/profiles/prodstack6 | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100755 openstack/profiles/prodstack6 diff --git a/openstack/profiles/default b/openstack/profiles/default index 5079a564..84c1f8f2 100755 --- a/openstack/profiles/default +++ b/openstack/profiles/default @@ -13,6 +13,7 @@ install_packages [[ -z "$CIDR_EXT" ]] && export CIDR_EXT="10.5.0.0/16" [[ -z "$FIP_RANGE" ]] && export FIP_RANGE="10.5.150.0:10.5.200.254" [[ -z "$CIDR_PRIV" ]] && export CIDR_PRIV="192.168.21.0/24" +[[ -z "$UNDERCLOUD_NETWORK_NAME" ]] && export UNDERCLOUD_NETWORK_NAME="${OS_PROJECT_NAME}_admin_net" NS_ARG="" [ "`juju config neutron-api enable-ml2-dns`" = "true" ] && unset NAMESERVER || NS_ARG="-N $NAMESERVER" @@ -34,7 +35,7 @@ if [ "$dvr_enabled" = "true" ] || $ovn_enabled; then if ${BARE_METAL:-false}; then echo "INFO: set 'juju config neutron-openvswitch data-port=...'" else - ./bin/add-data-ports.sh + ./bin/add-data-ports.sh "" "$UNDERCLOUD_NETWORK_NAME" fi fi diff --git a/openstack/profiles/prodstack6 b/openstack/profiles/prodstack6 new file mode 100755 index 00000000..831ff952 --- /dev/null +++ b/openstack/profiles/prodstack6 @@ -0,0 +1,15 @@ +#!/bin/bash -ex + +# stsstack overrides +[[ -z "$NAMESERVER" ]] && export NAMESERVER="91.189.91.131" +[[ -z "$SWIFT_IP" ]] && export SWIFT_IP="10.140.56.22" + +# Set defaults, if not already set. +[[ -z "$GATEWAY" ]] && export GATEWAY="10.142.35.1" +[[ -z "$CIDR_EXT" ]] && export CIDR_EXT="10.142.35.0/24" +[[ -z "$FIP_RANGE" ]] && export FIP_RANGE="10.142.35.200:10.142.35.254" +[[ -z "$CIDR_PRIV" ]] && export CIDR_PRIV="192.168.21.0/24" + +export UNDERCLOUD_NETWORK_NAME="$(sed -rn "s/.+OS_PROJECT_NAME=(.+)_project/net_\1/p" ~/novarc)" + +./profiles/default $@