Merge lp:~dweaver/orange-box/orange-box-robust-sync-charmstore into lp:orange-box

[Darryl Weaver]

Make orange-box-sync-charmstore more robust and test for charms before enabling as local charm store.

[Dustin Kirkland  (kirkland)]

Hmm, I think I'd rather see something more like a for loop, over a *bunch* (all?) charms, to make sure that we have what we need. This feels a little brittle, and incomplete...

review: Needs Fixing

[Dustin Kirkland  (kirkland)]

I wonder if we can check with the Eco team, for a way to *verify* that we have a complete local copy of the charm store...

[Darryl Weaver (dweaver)]

It was a quick fix for the charms not downloading correctly over bzr.
I would also prefer a better way of syncing the charmstore and verifying the sync.
However, this broke for me, because I have my launchpad user set for the ubuntu user on the OB in order to be able to download the private repos, which I need a user and key.
When using sudo to run the script this persists and causes a permission denied error as there is no matching key.
So, I was introducing basic checks to make sure:
1) I fixed the error that causes the bzr login mismatch and forces an anonymous download (just using sudo -i).
2) Check that at least some charms were downloaded to catch the error again and exit before changing all the links to a charmstore that doesn't exist, which breaks the bootstrap.
Juju-gui was a good one to check as that one takes the longest to download and is a good indicator that the sync completed.

=== modified file 'usr/bin/orange-box-sync-charmstore'
--- usr/bin/orange-box-sync-charmstore	2014-08-22 22:11:37 +0000
+++ usr/bin/orange-box-sync-charmstore	2014-10-01 17:24:20 +0000
@@ -31,13 +31,25 @@
 mkdir -p /srv/charmstore/snapshot-$DATE
 
 echo Mirroring the Charmstore ...
-cd /srv/charmstore/
-run-one charm getall snapshot-$DATE 2>/dev/null
+cd /srv/charmstore/snapshot-$DATE
+sudo -i run-one charm getall /srv/charmstore/snapshot-$DATE 2>/dev/null
+#check some base charms are there:
+if [ ! -d juju-gui ]; then
+        echo "Juju-gui charm is missing - exiting"
+        exit
+elif [ ! -d nova-cloud-controller ]; then
+        echo "nova-cloud-controller charm is missing - exiting"
+        exit
+elif [ ! -d mongodb ]; then
+        echo "mongodb charm is missing - exiting"
+        exit
+fi
+
 #Branch the Landscape charm - required for Landscape demo to minimise network dependencies
-cd snapshot-$DATE
-bzr branch lp:~landscape/landscape-charm/stable landscape >/dev/null 2>&1 || (cd landscape && bzr pull >/dev/null 2>&1)
+sudo -i bzr branch lp:~landscape/landscape-charm/stable /srv/charmstore/snapshot-$DATE/landscape >/dev/null 2>&1 || (cd /srv/charmstore/snapshot-$DATE/landscape && bzr pull >/dev/null 2>&1)
 #Branch the cinder-ceph charm - required for openstack
-bzr branch lp:charms/cinder-ceph  >/dev/null 2>&1 || (cd cinder-ceph && bzr pull >/dev/null 2>&1)
+sudo -i bzr branch lp:charms/cinder-ceph /srv/charmstore/snapshot-$DATE/cinder-ceph >/dev/null 2>&1 || (cd /srv/charmstore/snapshot-$DATE/cinder-ceph && bzr pull >/dev/null 2>&1)
+
 #Link directories for service aliases
 ln -s quantum-gateway neutron-gateway
 ln -s rabbitmq-server rabbitmq