Revert "Specify internal network to improve stability in a multi-NIC scenario."
This reverts commit 97811ef541
.
Please see comment in
https://review.openstack.org/#/c/648818/
Change-Id: I48b98b76fc4548290a7978521de5fb3d77a3a99a
This commit is contained in:
parent
97811ef541
commit
24a6d89ab2
|
@ -29,7 +29,6 @@ write_files:
|
||||||
ETCD_DISCOVERY_URL="$ETCD_DISCOVERY_URL"
|
ETCD_DISCOVERY_URL="$ETCD_DISCOVERY_URL"
|
||||||
USERNAME="$USERNAME"
|
USERNAME="$USERNAME"
|
||||||
PASSWORD="$PASSWORD"
|
PASSWORD="$PASSWORD"
|
||||||
CLUSTER_NETWORK="$CLUSTER_NETWORK"
|
|
||||||
CLUSTER_SUBNET="$CLUSTER_SUBNET"
|
CLUSTER_SUBNET="$CLUSTER_SUBNET"
|
||||||
TLS_DISABLED="$TLS_DISABLED"
|
TLS_DISABLED="$TLS_DISABLED"
|
||||||
KUBE_DASHBOARD_ENABLED="$KUBE_DASHBOARD_ENABLED"
|
KUBE_DASHBOARD_ENABLED="$KUBE_DASHBOARD_ENABLED"
|
||||||
|
|
|
@ -30,8 +30,6 @@ monitor-timeout=30s
|
||||||
monitor-max-retries=3
|
monitor-max-retries=3
|
||||||
[BlockStorage]
|
[BlockStorage]
|
||||||
bs-version=v2
|
bs-version=v2
|
||||||
[Networking]
|
|
||||||
internal-network-name=$CLUSTER_NETWORK
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
# Provide optional region parameter if it's set.
|
# Provide optional region parameter if it's set.
|
||||||
|
|
|
@ -493,7 +493,6 @@ resources:
|
||||||
"$AUTH_URL": {get_param: auth_url}
|
"$AUTH_URL": {get_param: auth_url}
|
||||||
"$USERNAME": {get_param: username}
|
"$USERNAME": {get_param: username}
|
||||||
"$PASSWORD": {get_param: password}
|
"$PASSWORD": {get_param: password}
|
||||||
"$CLUSTER_NETWORK": {get_param: fixed_network}
|
|
||||||
"$CLUSTER_SUBNET": {get_param: fixed_subnet}
|
"$CLUSTER_SUBNET": {get_param: fixed_subnet}
|
||||||
"$TLS_DISABLED": {get_param: tls_disabled}
|
"$TLS_DISABLED": {get_param: tls_disabled}
|
||||||
"$KUBE_DASHBOARD_ENABLED": {get_param: kube_dashboard_enabled}
|
"$KUBE_DASHBOARD_ENABLED": {get_param: kube_dashboard_enabled}
|
||||||
|
|
Loading…
Reference in New Issue