From 97811ef54143c92cebcf61145877153aa475e52d Mon Sep 17 00:00:00 2001
From: Bharat Kunwar <b.kunwar@gmail.com>
Date: Sat, 30 Mar 2019 07:47:48 +0000
Subject: [PATCH] Specify internal network to improve stability in a multi-NIC
 scenario.

When there is more than one NIC attached to an instance, openstack cloud
provider returns a random InternalIP back to the host resulting in instability
with API server which only talks to a default interface.

This patch incorporates the changes made in
https://github.com/kubernetes/cloud-provider-openstack/pull/444 which enables
OpenStack Cloud Controller Manager to respect the `internal-network-name` in
cloud-config file which ensures that InternalIP remains stable.

Story: 2005333
Task: 30271

Change-Id: I9e3ad459dd05753b53cb4ce75ee3aed649fef196
---
 .../kubernetes/fragments/write-heat-params-master.yaml          | 1 +
 .../templates/kubernetes/fragments/write-kube-os-config.sh      | 2 ++
 magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml   | 1 +
 3 files changed, 4 insertions(+)

diff --git a/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.yaml b/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.yaml
index 7ce9f22cb4..f2ad7ba440 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.yaml
+++ b/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.yaml
@@ -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"
diff --git a/magnum/drivers/common/templates/kubernetes/fragments/write-kube-os-config.sh b/magnum/drivers/common/templates/kubernetes/fragments/write-kube-os-config.sh
index b675c4c162..c9f8d89f7f 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/write-kube-os-config.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/write-kube-os-config.sh
@@ -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.
diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml
index 09bcd4656b..d037babe2e 100644
--- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml
+++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml
@@ -493,6 +493,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}