Browse Source

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
changes/49/650249/1
Spyros Trigazis 3 years ago
parent
commit
24a6d89ab2
  1. 1
      magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.yaml
  2. 2
      magnum/drivers/common/templates/kubernetes/fragments/write-kube-os-config.sh
  3. 1
      magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml

1
magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.yaml

@ -29,7 +29,6 @@ write_files:
ETCD_DISCOVERY_URL="$ETCD_DISCOVERY_URL"
USERNAME="$USERNAME"
PASSWORD="$PASSWORD"
CLUSTER_NETWORK="$CLUSTER_NETWORK"
CLUSTER_SUBNET="$CLUSTER_SUBNET"
TLS_DISABLED="$TLS_DISABLED"
KUBE_DASHBOARD_ENABLED="$KUBE_DASHBOARD_ENABLED"

2
magnum/drivers/common/templates/kubernetes/fragments/write-kube-os-config.sh

@ -30,8 +30,6 @@ monitor-timeout=30s
monitor-max-retries=3
[BlockStorage]
bs-version=v2
[Networking]
internal-network-name=$CLUSTER_NETWORK
EOF
# Provide optional region parameter if it's set.

1
magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml

@ -493,7 +493,6 @@ resources:
"$AUTH_URL": {get_param: auth_url}
"$USERNAME": {get_param: username}
"$PASSWORD": {get_param: password}
"$CLUSTER_NETWORK": {get_param: fixed_network}
"$CLUSTER_SUBNET": {get_param: fixed_subnet}
"$TLS_DISABLED": {get_param: tls_disabled}
"$KUBE_DASHBOARD_ENABLED": {get_param: kube_dashboard_enabled}

Loading…
Cancel
Save