Merge "Revert "Specify internal network to improve stability in a multi-NIC scenario.""

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"

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.

magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml

@@ -498,7 +498,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}