From ab08ec329dccbdf008cb058e887a9806cec7289e Mon Sep 17 00:00:00 2001
From: Ton Ngo <ton@us.ibm.com>
Date: Thu, 17 Mar 2016 05:00:50 +0000
Subject: [PATCH] Replace hardcoded eth0 interface in scripts

Make scripts adaptable to different network interface.

Some scripts currently query eth0 directly to get the IP of
the node.  This causes the script to fail if the node uses
a different network interface.  The change passes in the
IP from Heat so that it is not susceptible to the particular
network interface being used.

This change is necessary to use the stock image from Atomic,
since eth0 is not used in this image.

This patch is broken out from the patch:
https://review.openstack.org/#/c/276232/
so that it can proceed independently.

Co-Authored-By: Corey O'Brien <coreypobrien@gmail.com>
Partially-Implements: blueprint atomic23
Change-Id: If8f972d8dabc8304484dfaff8d4e7f1f8755507b
---
 magnum/templates/kubernetes/fragments/configure-etcd.sh        | 3 +--
 .../kubernetes/fragments/write-heat-params-master.yaml         | 1 +
 magnum/templates/kubernetes/fragments/write-heat-params.yaml   | 1 +
 magnum/templates/kubernetes/kubemaster.yaml                    | 1 +
 magnum/templates/kubernetes/kubeminion.yaml                    | 1 +
 magnum/templates/swarm/fragments/configure-etcd.sh             | 3 +--
 magnum/templates/swarm/fragments/write-swarm-agent-service.sh  | 3 +--
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/magnum/templates/kubernetes/fragments/configure-etcd.sh b/magnum/templates/kubernetes/fragments/configure-etcd.sh
index 165c7dc1a7..79350b671d 100644
--- a/magnum/templates/kubernetes/fragments/configure-etcd.sh
+++ b/magnum/templates/kubernetes/fragments/configure-etcd.sh
@@ -2,8 +2,7 @@
 
 . /etc/sysconfig/heat-params
 
-myip=$(ip addr show eth0 |
-awk '$1 == "inet" {print $2}' | cut -f1 -d/)
+myip="$KUBE_NODE_IP"
 
 cat > /etc/etcd/etcd.conf <<EOF
 ETCD_NAME="$myip"
diff --git a/magnum/templates/kubernetes/fragments/write-heat-params-master.yaml b/magnum/templates/kubernetes/fragments/write-heat-params-master.yaml
index 4577ab5515..91d99c56c1 100644
--- a/magnum/templates/kubernetes/fragments/write-heat-params-master.yaml
+++ b/magnum/templates/kubernetes/fragments/write-heat-params-master.yaml
@@ -8,6 +8,7 @@ write_files:
       KUBE_API_PUBLIC_ADDRESS="$KUBE_API_PUBLIC_ADDRESS"
       KUBE_API_PRIVATE_ADDRESS="$KUBE_API_PRIVATE_ADDRESS"
       KUBE_API_PORT="$KUBE_API_PORT"
+      KUBE_NODE_IP="$KUBE_NODE_IP"
       KUBE_ALLOW_PRIV="$KUBE_ALLOW_PRIV"
       DOCKER_VOLUME="$DOCKER_VOLUME"
       NETWORK_DRIVER="$NETWORK_DRIVER"
diff --git a/magnum/templates/kubernetes/fragments/write-heat-params.yaml b/magnum/templates/kubernetes/fragments/write-heat-params.yaml
index 5cde0b24f3..10d7ae3e18 100644
--- a/magnum/templates/kubernetes/fragments/write-heat-params.yaml
+++ b/magnum/templates/kubernetes/fragments/write-heat-params.yaml
@@ -8,6 +8,7 @@ write_files:
       KUBE_ALLOW_PRIV="$KUBE_ALLOW_PRIV"
       KUBE_MASTER_IP="$KUBE_MASTER_IP"
       KUBE_API_PORT="$KUBE_API_PORT"
+      KUBE_NODE_IP="$KUBE_NODE_IP"
       ETCD_SERVER_IP="$ETCD_SERVER_IP"
       DOCKER_VOLUME="$DOCKER_VOLUME"
       NETWORK_DRIVER="$NETWORK_DRIVER"
diff --git a/magnum/templates/kubernetes/kubemaster.yaml b/magnum/templates/kubernetes/kubemaster.yaml
index 785bca8807..d669f7aaf5 100644
--- a/magnum/templates/kubernetes/kubemaster.yaml
+++ b/magnum/templates/kubernetes/kubemaster.yaml
@@ -184,6 +184,7 @@ resources:
             "$KUBE_API_PUBLIC_ADDRESS": {get_param: api_public_address}
             "$KUBE_API_PRIVATE_ADDRESS": {get_param: api_private_address}
             "$KUBE_API_PORT": {get_param: kubernetes_port}
+            "$KUBE_NODE_IP": {get_attr: [kube_master_eth0, fixed_ips, 0, ip_address]}
             "$KUBE_ALLOW_PRIV": {get_param: kube_allow_priv}
             "$DOCKER_VOLUME": {get_resource: docker_volume}
             "$NETWORK_DRIVER": {get_param: network_driver}
diff --git a/magnum/templates/kubernetes/kubeminion.yaml b/magnum/templates/kubernetes/kubeminion.yaml
index deef611376..dba54ea705 100644
--- a/magnum/templates/kubernetes/kubeminion.yaml
+++ b/magnum/templates/kubernetes/kubeminion.yaml
@@ -195,6 +195,7 @@ resources:
             $KUBE_ALLOW_PRIV: {get_param: kube_allow_priv}
             $KUBE_MASTER_IP: {get_param: kube_master_ip}
             $KUBE_API_PORT: {get_param: kubernetes_port}
+            $KUBE_NODE_IP: {get_attr: [kube_minion_eth0, fixed_ips, 0, ip_address]}
             $ETCD_SERVER_IP: {get_param: etcd_server_ip}
             $DOCKER_VOLUME: {get_resource: docker_volume}
             $NETWORK_DRIVER: {get_param: network_driver}
diff --git a/magnum/templates/swarm/fragments/configure-etcd.sh b/magnum/templates/swarm/fragments/configure-etcd.sh
index 165c7dc1a7..1e3f2a0e48 100644
--- a/magnum/templates/swarm/fragments/configure-etcd.sh
+++ b/magnum/templates/swarm/fragments/configure-etcd.sh
@@ -2,8 +2,7 @@
 
 . /etc/sysconfig/heat-params
 
-myip=$(ip addr show eth0 |
-awk '$1 == "inet" {print $2}' | cut -f1 -d/)
+myip="$SWARM_NODE_IP"
 
 cat > /etc/etcd/etcd.conf <<EOF
 ETCD_NAME="$myip"
diff --git a/magnum/templates/swarm/fragments/write-swarm-agent-service.sh b/magnum/templates/swarm/fragments/write-swarm-agent-service.sh
index ffbbbe6293..33eef227cb 100644
--- a/magnum/templates/swarm/fragments/write-swarm-agent-service.sh
+++ b/magnum/templates/swarm/fragments/write-swarm-agent-service.sh
@@ -2,8 +2,7 @@
 
 . /etc/sysconfig/heat-params
 
-myip=$(ip addr show eth0 |
-       awk '$1 == "inet" {print $2}' | cut -f1 -d/)
+myip="$SWARM_NODE_IP"
 
 CONF_FILE=/etc/systemd/system/swarm-agent.service