Browse Source

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

changes/09/649609/1
Zuul 2 years ago
committed by Gerrit Code Review
parent
commit
f5a2cba743
3 changed files with 4 additions and 0 deletions
  1. +1
    -0
      magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.yaml
  2. +2
    -0
      magnum/drivers/common/templates/kubernetes/fragments/write-kube-os-config.sh
  3. +1
    -0
      magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml

+ 1
- 0
magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.yaml View File

@ -29,6 +29,7 @@ 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
- 0
magnum/drivers/common/templates/kubernetes/fragments/write-kube-os-config.sh View File

@ -30,6 +30,8 @@ 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
- 0
magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml View File

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