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

[Darryl Weaver]

More robust orange-box-sync-charmstore script.
Now downloads a tarball for the precise and trusty charms.
Then uses bzr to download the landscape server charm.
It only copies into place if the tarball has worked.

Now takes less than 1 minute to sync the charm store.

[lp:~dweaver/orange-box/orange-box-robust-sync-charmstore-tarball]

493. By Darryl Weaver on 2014-10-01

Added missing cinder-ceph charm to local charmstore sync.

=== modified file 'usr/bin/orange-box-sync-charmstore'
--- usr/bin/orange-box-sync-charmstore	2014-10-01 18:44:32 +0000
+++ usr/bin/orange-box-sync-charmstore	2014-10-01 22:44:50 +0000
@@ -27,29 +27,34 @@
 
 echo Creating Charm Store directories ...
 [ -e /srv/charmstore/ ] || mkdir -p /srv/charmstore/
-DATE=`date +%Y%m%d-%H%M%S`
-mkdir -p /srv/charmstore/snapshot-$DATE
-
-echo Mirroring the Charmstore ...
 cd /srv/charmstore/
-run-one charm getall snapshot-$DATE 2>/dev/null
-#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)
-#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)
-#Link directories for service aliases
-ln -s quantum-gateway neutron-gateway
-ln -s rabbitmq-server rabbitmq
-#Re-linking to current directories
-rm -f /srv/charmstore/current
-ln -s /srv/charmstore/snapshot-$DATE /srv/charmstore/current
-#Re-linking precise
-rm -rf /srv/charmstore/precise
-ln -s /srv/charmstore/current /srv/charmstore/precise
-#Re-linking trusty
-rm -rf /srv/charmstore/trusty
-ln -s /srv/charmstore/current /srv/charmstore/trusty
+echo Grabbing the latest charmstore tarball...
+[[ -f "latest.tar.gz" ]] && rm -f latest.tar.gz
+wget -q http://people.canonical.com/~marco/mirror/juju/charmstore/latest.tar.gz
+[[ -f "latest.tar.gz" ]] || exit
+mkdir -p staging
+cd staging
+echo Untarring charmstore
+tar xzf ../latest.tar.gz || exit
+chown -R root.root *
+for series in precise trusty
+do
+        cd $series
+        bzr branch lp:~landscape/landscape-charm/stable landscape
+	bzr branch lp:charms/cinder-ceph cinder-ceph
+        ln -s quantum-gateway neutron-gateway
+        ln -s rabbitmq-server rabbitmq
+        cd ..
+done
+cd ..
+echo Removing the old directories...
+rm -rf current
+rm -rf snapshot-*
+rm -rf precise
+rm -rf trusty
+echo Moving new charmstore into place
+mv staging/* ./
+rm -rf staging
+rm -f latest.tar.gz
 echo Done. && echo
-
 echo "Charm store synced to directory /srv/charmstore/"