diff --git a/devstack/lib/tacker b/devstack/lib/tacker index d6e936e6e..38f4dc1ab 100644 --- a/devstack/lib/tacker +++ b/devstack/lib/tacker @@ -258,7 +258,7 @@ function configure_tacker { iniset $TACKER_CONF DEFAULT auth_strategy $TACKER_AUTH_STRATEGY _tacker_setup_keystone $TACKER_CONF keystone_authtoken - if [[ "${TACKER_MODE}" == "all" || -v IS_ZUUL_FT ]]; then + if [[ "${TACKER_MODE}" == "all" || "${IS_ZUUL_FT}" == "True" ]]; then iniset "/$Q_PLUGIN_CONF_FILE" ml2_type_flat flat_networks $PUBLIC_PHYSICAL_NETWORK,$MGMT_PHYS_NET iniset "/$Q_PLUGIN_CONF_FILE" ovs bridge_mappings $PUBLIC_PHYSICAL_NETWORK:$PUBLIC_BRIDGE,$MGMT_PHYS_NET:$BR_MGMT diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 2efd50642..ebfc0506e 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -41,7 +41,7 @@ if is_service_enabled tacker; then tacker_horizon_install fi - if [[ "${TACKER_MODE}" == "all" || -v IS_ZUUL_FT ]]; then + if [[ "${TACKER_MODE}" == "all" || "${IS_ZUUL_FT}" == "True" ]]; then echo_summary "Setup initial tacker network" tacker_create_initial_network echo_summary "Check and download images for tacker initial" diff --git a/devstack/settings b/devstack/settings index 4228ad52f..d4ac902bc 100644 --- a/devstack/settings +++ b/devstack/settings @@ -1,8 +1,9 @@ TACKER_MODE=${TACKER_MODE:-all} USE_BARBICAN=True KUBERNETES_VIM=${KUBERNETES_VIM:-False} +IS_ZUUL_FT=${IS_ZUUL_FT:-False} -if [ "${TACKER_MODE}" == "all" -o ${IS_ZUUL_FT+yes} ]; then +if [ "${TACKER_MODE}" == "all" -o "${IS_ZUUL_FT}" == "True" ]; then MGMT_PHYS_NET=${MGMT_PHYS_NET:-mgmtphysnet0} # br-infra is created by devstack multi node job # https://opendev.org/zuul/zuul-jobs/src/branch/master/roles/multi-node-bridge