Merge lp:~thomnico/charms/precise/clearwater-bono/openstack-support into lp:~matt-williams-x/charms/precise/clearwater-bono/trunk

[Nicolas Thomas]

Adding OpenStack support

linked to : https://code.launchpad.net/~thomnico/charms/precise/dns/openstack-support

Should not impact EC2

[lp:~thomnico/charms/precise/clearwater-bono/openstack-support]

12. By Nicolas Thomas on 2014-09-12

 OpenStack support

Unmerged revisions

12. By Nicolas Thomas on 2014-09-12

 OpenStack support

11. By Nicolas Thomas on 2014-09-08

 OpenStack support

=== modified file 'hooks/programmable-multiple-relation-changed'
--- hooks/programmable-multiple-relation-changed	2014-06-06 14:38:15 +0000
+++ hooks/programmable-multiple-relation-changed	2014-09-12 15:09:17 +0000
@@ -17,9 +17,9 @@
 if [ "$(relation-get public-address)" != "" ]
 then
   echo nameserver $(relation-get public-address) > /etc/dnsmasq.resolv.conf
-  grep -v ^RESOLV_CONF= /etc/default/dnsmasq > /tmp/dnsmasq.$$
+  grep -v ^RESOLV_CONF= /etc/default/dnsmasq > /tmp/dnsmasq.$$ || juju-log "WARNING RESOLV_CONF not found"
   mv /tmp/dnsmasq.$$ /etc/default/dnsmasq
-  echo RESOLV_CONF=/etc/dnsmasq.resolv.conf > /etc/default/dnsmasq
+  echo RESOLV_CONF=/etc/dnsmasq.resolv.conf >> /etc/default/dnsmasq
   service dnsmasq restart
 fi
 

=== modified file 'lib/unit-get'
--- lib/unit-get	2014-06-07 07:10:01 +0000
+++ lib/unit-get	2014-09-12 15:09:17 +0000
@@ -1,17 +1,36 @@
 #!/bin/bash
-set -e
-
+set -ex
+onEC2=false
 key=$1
 val=$(unit-get $1)
 
-if [ "$key" = "public-address" ] &&
-   [ -n "$(dig +short $val | head -1)" ]
-then
-  val=$(curl http://169.254.169.254/latest/meta-data/public-ipv4)
-elif [ "$key" = "private-address" ]
-then
-  val_ip=$(dig +short $val | head -1)
-  [ -z "$val_ip" ] || val=$val_ip
+if [ -f $CHARM_DIR/lib/provider.txt ]
+then
+    PROVIDER=`cat $CHARM_DIR/lib/provider.txt `
+else
+    #checking dirty ec2 hack will work
+    wget  -q http://169.254.169.254/latest/meta-data/public-ipv4 && onEC2=true
+    if ( "$onEC2" == true )
+    then
+	echo "EC2" >  $CHARM_DIR/lib/provider.txt
+    else
+	echo "NOTEC2" >  $CHARM_DIR/lib/provider.txt
+    fi
+fi
+
+if [ "$PROVIDER" == "EC2" ]
+then
+ if [ "$key" = "public-address" ] &&   [ -n "$(dig +short $val | head -1)" ]
+  then
+   val=$(curl http://169.254.169.254/latest/meta-data/public-ipv4)
+ elif [ "$key" = "private-address" ]
+ then
+   val_ip=$(dig +short $val | head -1)
+   [ -z "$val_ip" ] || val=$val_ip
+   ##if val_ip is empty getting the system IP
+   [ -z "$val_ip" ] && val=`ip route | grep src | cut -d " " -f 12`
+ fi
 fi
 
 echo $val
+