Merge lp:~thomnico/orange-box-examples/serie-of-small-bugfixes into lp:orange-box-examples

[Nicolas Thomas]

[Nicolas Thomas (thomnico)]

review: Approve

[Nicolas Thomas (thomnico)]

review: Approve

=== added file 'bin/bundle2local.sh'
--- bin/bundle2local.sh	1970-01-01 00:00:00 +0000
+++ bin/bundle2local.sh	2015-07-22 09:07:53 +0000
@@ -0,0 +1,82 @@
+#!/bin/bash
+#
+#   bundle2local
+#    Copyright (C) 2014 Canonical Ltd.
+#
+#    Authors:         Nicolas Thomas <[e-mail]>
+#  
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, version 3 of the License.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+## TODO start from juju-deployer to do the same but more beautifully .. 
+set -ex
+
+
+bundle2local()
+{
+
+[ -d charmstore/trusty ] || mkdir -p charmstore/trusty
+[ -d charmstore/precise ] || mkdir -p charmstore/precise
+TMPFILE=`mktemp`
+CACHEDIRS=`mktemp`
+ROOTDIR=$PWD
+
+### this is THE biggest hack deployer know how to match charmstore to specific version reuse that and turn it into local charms. bonus it is super fast
+juju-deployer -vbu -c $1 2>&1 | grep "Cache dir" |awk '{print $5}' > $CACHEDIRS
+
+## regex to get serie and charm name.
+grep "charm:" $1  | sed -r 's!.*charm\s*.*.*(trusty|precise)\/(.*)!\1:\2!' > $TMPFILE       
+#normalise if there is " or ' some bundle don't have them
+sed -ie 's|["'\'']||g' $TMPFILE  
+while IFS=: read serie charm
+do           
+    canonicalcharm=`echo $charm | sed -r 's!(.*)-.*[0-9]$!\1!'`
+    CHARMDIR=`grep $serie_$charm $CACHEDIRS` 
+    [ -d charmstore/$serie/$charm ] || mkdir -p charmstore/$serie/$charm
+    cp -rf $CHARMDIR/* charmstore/$serie/$charm/ 
+cd $ROOTDIR
+done <$TMPFILE
+## Now create a -local version of the bundle:
+BASEFILE=`basename $1 .yaml`
+cat $1 | sed -r 's!(^.*\s)charm:\s*(.*)*(trusty|precise)\/(.*)*"$!\1charm: local:\3/\4!'  > ${BASEFILE}-local.yaml
+cat <<EOF
+You can now do:
+export JUJU_REPOSITORY=$ROOTDIR/charmstore
+juju-deployer -c ${BASEFILE}-local.yaml
+
+To use your locally copied charms
+If your bundle was already using some local charms you will have to copy them in $ROOTDIR/charmstore
+EOF
+
+}
+
+usage()
+{
+cat << EOF
+
+bundle2local - create a local usable copy of charms and create a local version of the bundle
+
+USAGE: bundle2local mybundle.yaml
+    Be sure to have charm-tools installed
+    If already downloaded a pull request will be done.
+    the charmstore will be local to the directory you run the script in.
+EOF
+exit 0
+}
+
+
+[ $# -lt 1 ] && usage
+[ -f $1 ] || usage
+BUNDLE=$1
+
+bundle2local $1
+

=== modified file 'bin/orange-box-import-SA-keys'
--- bin/orange-box-import-SA-keys	2015-05-12 23:30:15 +0000
+++ bin/orange-box-import-SA-keys	2015-07-22 09:07:53 +0000
@@ -4,7 +4,7 @@
 mv ~/.ssh/authorized_keys ~/.ssh/authorized_keys.old
 
 #copy maas user's ssh key
-sudo cat /home/maas/.ssh/id_rsa.pub > ~/.ssh/authorized_keys
+sudo cat ~maas/.ssh/id_rsa.pub > ~/.ssh/authorized_keys
 
 #sabdfl
 ssh-import-id sabdfl

=== modified file 'contrail/contrail.yaml'
--- contrail/contrail.yaml	2015-05-12 22:13:31 +0000
+++ contrail/contrail.yaml	2015-07-22 09:07:53 +0000
@@ -118,7 +118,8 @@
     - [ contrail-control, contrail-configuration ]
     - [ nova-compute, neutron-contrail ]
     - [ contrail-webui, keystone ]
-    - [ contrail-webui, contrail-configuration ]
+    - - "contrail-webui:contrail_discovery"
+      - "contrail-configuration:contrail-discovery"
     - [ neutron-contrail, contrail-control ]
     - [ neutron-contrail, neutron-gateway ]
     - [ neutron-contrail, contrail-configuration ]

=== modified file 'openstack/icehouse/trusty/icehouseOB-local.yaml'
--- openstack/icehouse/trusty/icehouseOB-local.yaml	2015-02-07 17:59:14 +0000
+++ openstack/icehouse/trusty/icehouseOB-local.yaml	2015-07-22 09:07:53 +0000
@@ -1,25 +1,26 @@
 icehouse:
   overrides:
     openstack-origin: "cloud:trusty-icehouse"
+    source: "distro"
   services:
     ceph:
-      branch: "lp:charms/ceph"
+      charm: "local:trusty/ceph-27"
       num_units: 3
       constraints: tags=physical
       options:
         fsid: "9e7aac42-4bf4-11e3-b4b7-5254006a039c"
         "monitor-secret": AQAAvoJSOAv/NRAAgvXP8d7iXN7lWYbvDZzm2Q==
-        "osd-devices": "/srv"
+        "osd-devices": "/srv /dev/sdb"
         "osd-reformat": "yes"
       annotations:
         "gui-x": "2648.6688842773438"
         "gui-y": "708.3873901367188"
     ubuntu:
-      branch: "lp:charms/ubuntu"
+      charm: "local:trusty/ubuntu"
       num_units: 1
       constraints: tags=physical
     keystone: 
-      branch: "lp:charms/keystone"
+      charm: "local:trusty/keystone-5"
       num_units: 1
       to: lxc:ubuntu=0
       options: 
@@ -29,7 +30,7 @@
         "gui-x": "2013.905517578125"
         "gui-y": "75.58013916015625"
     "nova-compute":
-      branch: "lp:charms/nova-compute"
+      charm: "local:trusty/nova-compute-11"
       num_units: 3
       to: [ceph=0, ceph=1, ceph=2]
       options:
@@ -38,7 +39,7 @@
         "gui-x": "776.1040649414062"
         "gui-y": "-81.22811031341553"
     "neutron-gateway":
-      branch: "lp:charms/quantum-gateway"
+      charm: "local:trusty/quantum-gateway-3"
       num_units: 1
       constraints: tags=virtual
       options:
@@ -48,30 +49,31 @@
         "gui-x": "329.0572509765625"
         "gui-y": "46.4658203125"
     "nova-cloud-controller": 
-      branch: "lp:charms/nova-cloud-controller"
+      charm: "local:trusty/nova-cloud-controller-50"
       num_units: 1
       to: lxc:ubuntu=0
       options: 
         "network-manager": Neutron
+        "console-access-protocol": novnc
       annotations:
         "gui-x": "1388.40185546875"
         "gui-y": "-118.01156234741211"
     rabbitmq: 
-      branch: "lp:charms/rabbitmq-server"
+      charm: "local:trusty/rabbitmq-server-4"
       num_units: 1
       to: lxc:ubuntu=0
       annotations:
         "gui-x": "633.8120727539062"
         "gui-y": "862.6530151367188"
     glance: 
-      branch: "lp:charms/glance"
+      charm: "local:trusty/glance-3"
       num_units: 1
       to: lxc:ubuntu=0
       annotations:
         "gui-x": "1147.3269653320312"
         "gui-y": "1389.5643157958984"
     cinder: 
-      branch: "lp:charms/cinder"
+      charm: "local:trusty/cinder-4"
       num_units: 1
       to: lxc:ubuntu=0
       options: 
@@ -80,20 +82,20 @@
         "gui-x": "1752.32568359375"
         "gui-y": "1365.716194152832"
     "ceph-radosgw":
-      branch: "lp:charms/ceph-radosgw"
+      charm: "local:trusty/ceph-radosgw-3"
       num_units: 1
       to: lxc:ubuntu=0
       annotations:
         "gui-x": "2216.68212890625"
         "gui-y": "697.16796875"
     cinder-ceph:
-      branch: "lp:charms/cinder-ceph"
+      charm: "local:trusty/cinder-ceph-1"
       num_units: 0
       annotations:
         "gui-x": "2257.5515747070312"
         "gui-y": "1231.2130126953125"
     "openstack-dashboard": 
-      branch: "lp:charms/openstack-dashboard"
+      charm: "local:trusty/openstack-dashboard-4"
       num_units: 1
       to: lxc:ubuntu=0
       options:
@@ -102,7 +104,7 @@
         "gui-x": "2353.6898193359375"
         "gui-y": "-94.2642593383789"
     mysql: 
-      branch: "lp:charms/mysql"
+      charm: "local:trusty/mysql-1"
       num_units: 1
       to: lxc:ubuntu=0
       options:
@@ -111,34 +113,34 @@
         "gui-x": "364.4567565917969"
         "gui-y": "1067.5167846679688"
     mongodb:
-      branch: "lp:charms/mongodb"
+      charm: "local:trusty/mongodb-0"
       num_units: 1
       to: lxc:ubuntu=0
       annotations:
         "gui-x": "-70.0399979352951"
         "gui-y": "1282.8224487304688"
     ceilometer:
-      branch: "lp:charms/ceilometer"
+      charm: "local:trusty/ceilometer-0"
       num_units: 1
       to: lxc:ubuntu=0
       annotations:
         "gui-x": "-78.13333225250244"
         "gui-y": "919.3128051757812"
     ceilometer-agent:
-      branch: "lp:charms/ceilometer-agent"
+      charm: "local:trusty/ceilometer-agent-0"
       num_units: 0
       annotations:
         "gui-x": "-90.9158582687378"
         "gui-y": "562.5347595214844"
     heat:
-      branch: "lp:charms/heat"
+      charm: "local:trusty/heat-0"
       num_units: 1
       to: lxc:ubuntu=0
       annotations:
         "gui-x": "494.94012451171875"
         "gui-y": "1363.6024169921875"
     ntp:
-      branch: "lp:charms/ntp"
+      charm: "local:trusty/ntp-4"
       num_units: 0
       annotations:
         "gui-x": "-104.57728099822998"

=== modified file 'telco/mydomain-bundle.sh'
--- telco/mydomain-bundle.sh	2015-02-18 16:44:51 +0000
+++ telco/mydomain-bundle.sh	2015-07-22 09:07:53 +0000
@@ -28,7 +28,9 @@
       annotations: 
         "gui-x": "400"
         "gui-y": "0"
-    "clearwater-homer": 
+      to: 
+        - lxc:clearwater-bono=0
+    clearwater-homer: 
       charm: "cs:~thomnico/precise/clearwater-homer"
       num_units: 1
       options: 
@@ -48,7 +50,8 @@
       annotations: 
         "gui-x": "200"
         "gui-y": "300"
-    "clearwater-sprout": 
+      to: lxc:clearwater-homer=0
+    clearwater-sprout: 
       charm: "cs:~thomnico/precise/clearwater-sprout"
       num_units: 1
       options: 
@@ -68,7 +71,8 @@
       annotations: 
         "gui-x": "1000"
         "gui-y": "450"
-    "telscale-load-balancer": 
+      to: lxc:clearwater-bono=0
+    telscale-load-balancer: 
       charm: "cs:~thomnico/trusty/telscale-load-balancer"
       num_units: 1
       expose: true
@@ -83,14 +87,16 @@
       annotations: 
         "gui-x": "-500.8215242215981"
         "gui-y": "698.5485784445332"
-    sipml5: 
+      to: lxc:telscale-load-balancer=0
+    sipml5:
       charm: "cs:~thomnico/trusty/sipml5"
       num_units: 1
       expose: true
       annotations: 
         "gui-x": "1383.4697265625"
         "gui-y": "423.10858154296875"
-    "telscale-restcomm": 
+      to: lxc:clearwater-bono=0
+    telscale-restcomm: 
       charm: "cs:~thomnico/trusty/telscale-restcomm"
       num_units: 1
       constraints: arch=amd64 mem=2G
@@ -98,6 +104,7 @@
       annotations: 
         "gui-x": "-500.625244140625"
         "gui-y": "547.9537963867188"
+      to: lxc:telscale-load-balancer=0
   relations: 
     - - "clearwater-bono:scscf"
       - "clearwater-sprout:pcscf"