From f7aa6084b75a571cbcca022910214ec8c4103968 Mon Sep 17 00:00:00 2001 From: Alex Polvi Date: Fri, 21 Mar 2014 03:54:35 +0000 Subject: [PATCH] fix(oem-rackspace): add coreos-setup-environment for rackspace --- .../files/coreos-setup-environment | 35 +++++++++++++++++++ .../oem-rackspace/oem-rackspace-0.0.1.ebuild | 3 ++ 2 files changed, 38 insertions(+) create mode 100755 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/coreos-setup-environment diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/coreos-setup-environment b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/coreos-setup-environment new file mode 100755 index 0000000000..58119841da --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/coreos-setup-environment @@ -0,0 +1,35 @@ +#!/bin/bash +x + +ENV=$1 + +if [ -z "$ENV" ]; then + echo usage: $0 /etc/environment + exit 1 +fi +# test for rw +touch $ENV +if [ $? -ne 0 ]; then + echo exiting, unable to modify: $ENV + exit 1 +fi + +sed -i -e '/^COREOS_PUBLIC_IPV4=/d' \ + -e '/^COREOS_PRIVATE_IPV4=/d' \ + "${ENV}" + +# We spin loop until the nova-agent sets up the ip addresses +function get_ip () { + IF=$1 + IP= + while [ 1 ]; do + IP=$(ifconfig $IF | awk '/inet /{print $2}') + if [ "$IP" != "" ]; then + break + fi + sleep .1 + done + echo $IP +} + +echo COREOS_PUBLIC_IPV4=$(get_ip eth0) >> $ENV +echo COREOS_PRIVATE_IPV4=$(get_ip eth1) >> $ENV diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1.ebuild index fc69d724b6..38afcc6068 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1.ebuild @@ -28,4 +28,7 @@ src_install() { rsync --exclude=".git" -aq ${S}/ ${D}/nova-agent/ insinto "/" doins ${FILESDIR}/cloud-config.yml + + into "/" + dobin ${FILESDIR}/coreos-setup-environment }