diff --git a/magnum/drivers/k8s_coreos_v1/templates/fragments/configure-etcd.yaml b/magnum/drivers/k8s_coreos_v1/templates/fragments/configure-etcd.yaml index 4384b4d9ee..5fcf592d32 100644 --- a/magnum/drivers/k8s_coreos_v1/templates/fragments/configure-etcd.yaml +++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/configure-etcd.yaml @@ -21,8 +21,7 @@ write_files: #!/bin/sh . /etc/sysconfig/heat-params - myip=$(ip addr show eth0 | - awk '$1 == "inet" {print $2}' | cut -f1 -d/) + myip=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4) DROP_IN_FILE=/etc/systemd/system/etcd2.service.d/20-configure-etcd.conf mkdir -p $(dirname $DROP_IN_FILE) diff --git a/magnum/drivers/k8s_coreos_v1/templates/fragments/create-kube-namespace.yaml b/magnum/drivers/k8s_coreos_v1/templates/fragments/create-kube-namespace.yaml index d7172de526..b6b1a19a98 100644 --- a/magnum/drivers/k8s_coreos_v1/templates/fragments/create-kube-namespace.yaml +++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/create-kube-namespace.yaml @@ -23,8 +23,7 @@ write_files: #!/bin/sh . /etc/sysconfig/heat-params - myip=$(ip addr show eth0 | - awk '$1 == "inet" {print $2}' | cut -f1 -d/) + myip=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4) until curl -sf "http://127.0.0.1:8080/healthz" do diff --git a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-apiserver.yaml b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-apiserver.yaml index 10a14e8c1f..6792a98f8d 100644 --- a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-apiserver.yaml +++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-apiserver.yaml @@ -21,8 +21,7 @@ write_files: #!/bin/sh . /etc/sysconfig/heat-params - myip=$(ip addr show eth0 | - awk '$1 == "inet" {print $2}' | cut -f1 -d/) + myip=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4) KUBE_CERTS_PATH=/etc/kubernetes/ssl HOST_CERTS_PATH=/usr/share/ca-certificates diff --git a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-proxy-master.yaml b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-proxy-master.yaml index d455f595a5..e7edd4b852 100644 --- a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-proxy-master.yaml +++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-proxy-master.yaml @@ -21,8 +21,8 @@ write_files: #!/bin/sh . /etc/sysconfig/heat-params - myip=$(ip addr show eth0 | - awk '$1 == "inet" {print $2}' | cut -f1 -d/) + myip=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4) + HOST_CERTS_PATH=/usr/share/ca-certificates diff --git a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-proxy-minion.yaml b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-proxy-minion.yaml index 6a84b19897..e53a038fea 100644 --- a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-proxy-minion.yaml +++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-proxy-minion.yaml @@ -21,8 +21,7 @@ write_files: #!/bin/sh . /etc/sysconfig/heat-params - myip=$(ip addr show eth0 | - awk '$1 == "inet" {print $2}' | cut -f1 -d/) + myip=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4) KUBE_CERTS_PATH=/etc/kubernetes/ssl KUBE_CONFIG_PATH=/etc/kubernetes/config diff --git a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-master.yaml b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-master.yaml index c60bfb7c76..564d2bd84e 100644 --- a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-master.yaml +++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-master.yaml @@ -21,8 +21,7 @@ write_files: #!/bin/sh . /etc/sysconfig/heat-params - myip=$(ip addr show eth0 | - awk '$1 == "inet" {print $2}' | cut -f1 -d/) + myip=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4) CONF_FILE=/etc/systemd/system/kubelet.service cat > $CONF_FILE <