Merge lp:~dweaver/orange-box/orange-box-improve-local-charmstore-handling into lp:orange-box

[Darryl Weaver]

Improvements in local charm store sync handling.
Versioned directories to allow linking to use older sync.
Weekly cron job to sync the charm store.
Monthly cron job to delete charm store syncs older than 90 days.

[lp:~dweaver/orange-box/orange-box-improve-local-charmstore-handling]

400. By Darryl Weaver on 2014-07-30

Modified orange-box-create-package-mirror to use orange-box-mirror.list instead of mirror.list.

401. By Darryl Weaver on 2014-08-02

Fixed bug in charm store sync and make it run in foreground.

402. By Darryl Weaver on 2014-08-02

Corrected bug with paths.

403. By Darryl Weaver on 2014-08-02

Added cinder-ceph to charmstore sync.

=== modified file 'debian/postinst'
--- debian/postinst	2014-08-01 11:01:16 +0000
+++ debian/postinst	2014-08-02 15:50:37 +0000
@@ -74,8 +74,12 @@
 	mkdir -p /srv/mirrors/archive.ubuntu.com
 	echo '<meta http-equiv="refresh" content="0; url=MAAS/">' > /srv/mirrors/archive.ubuntu.com/index.html
 	invoke-rc.d apache2 restart
-	mkdir -p /srv/charmstore/precise
+	#sync the charm store to /srv/charmstore
+	orange-box-sync-charmstore
 	run-one charm getall /srv/charmstore/precise 2>/dev/null &
+	#Branch the Landscape charm - required for Landscape demo to minimise network dependencies
+	cd /srv/charmstore/precise
+	bzr branch lp:~landscape/landscape-charm/stable landscape
 }
 
 setup_boot_resources() {
@@ -163,6 +167,9 @@
 	git clone https://github.com/juju/plugins /home/ubuntu/.juju-plugins
 	sudo chown -R ubuntu:ubuntu /home/ubuntu/
 	echo "PATH=\$PATH:/home/ubuntu/.juju-plugins" >> /home/ubuntu/.bashrc
+	#Required for local charm deployments to work.
+	sed -i -e '/^export JUJU_REPOSITORY=/d' /home/ubuntu/.bashrc
+	echo "export JUJU_REPOSITORY=/srv/charmstore" >> /home/ubuntu/.bashrc
 }
 
 ensure_running() {

=== added file 'etc/cron.d/charmstore-mirror'
--- etc/cron.d/charmstore-mirror	1970-01-01 00:00:00 +0000
+++ etc/cron.d/charmstore-mirror	2014-08-02 15:50:37 +0000
@@ -0,0 +1,4 @@
+#Run every Staurday at 03:23 in the morning, if plugged in and internet is accessible the charmstore will be updated.
+#Remove any charmstore directories inot modified in the last 90 days to save space.
+23 3 * * 6	root	run-one orange-box-sync-charmstore >>/var/log/orange-box-sync-charmstore.log 2>&1
+38 4 1 * *	root	run-one find /srv/charmstore/ -maxdepth 1 -mindepth 1 -type d -mtime +90 -exec rm -rf {} \;

=== modified file 'usr/bin/orange-box-create-package-mirror'
--- usr/bin/orange-box-create-package-mirror	2014-04-14 21:07:34 +0000
+++ usr/bin/orange-box-create-package-mirror	2014-08-02 15:50:37 +0000
@@ -30,7 +30,7 @@
 IP=10.14.4.1
 
 function run_mirror { 
-    echo "apt-mirror /etc/apt/mirror.list" 
+    echo "apt-mirror /etc/apt/orange-box-mirror.list >>/var/log/orange-box-mirror.log 2>&1"
 }
 
 echo THIS IS MEANT TO BE RUN FROM WITHIN THE TOP LEVEL micro-cluster BRANCH
@@ -78,24 +78,19 @@
 # Create our charm mirror
 echo Creating Charm Store Mirror ...
 echo Creating Charm Store directories ...
-[ -e /srv/charmstore/precise ] || mkdir -p /srv/charmstore/precise
+[ -e /srv/charmstore ] || mkdir -p /srv/charmstore
 
 echo Mirroring the Charmstore ...
-# This may not work :/ Ran into issues on my test precise VM
-cd /srv/charmstore/
-charm getall precise
-
-echo Making Trusty Charms *THIS IS A HACK TO BE FIXED WHEN TRUSTY CHARMS EXIST
-cp -a /srv/charmstore/precise /srv/charmstore/trusty
+orange-box-sync-charmstore
 echo Done. && echo
 
 # Set up apt-mirror to mirror the archives
 echo Setting up Apt Mirror ...
 cd $home
-if [ -f /etc/apt/mirror.list ]; then
-    mv /etc/apt/mirror.list /etc/apt/mirror.list.orig
+if [ -f /etc/apt/orange-box-mirror.list ]; then
+    mv /etc/apt/orange-box-mirror.list /etc/apt/orange-box-mirror.list.orig
 fi
-cp etc/apt/mirror.list /etc/apt
+cp etc/apt/orange-box-mirror.list /etc/apt
 
 echo Making mirror directories ...
 mkdir -p /srv/mirrors /srv/skel /srv/var
@@ -117,7 +112,9 @@
 
 echo Copying config file to apache ...
 cd $home
-cp etc/apache2/sites-enabled/000-default.conf /etc/apache2/sites-enabled
+cp etc/apache2/sites-enabled/* /etc/apache2/sites-enabled
+a2ensite archive
+a2ensite ubuntu-cloud
 
 echo Restarting Apache ...
 service apache2 restart

=== added file 'usr/bin/orange-box-sync-charmstore'
--- usr/bin/orange-box-sync-charmstore	1970-01-01 00:00:00 +0000
+++ usr/bin/orange-box-sync-charmstore	2014-08-02 15:50:37 +0000
@@ -0,0 +1,55 @@
+#!/bin/bash
+#
+#    orange-box-sync-charmstore
+#    Copyright (C) 2014 Canonical Ltd.
+#
+#    Authors: Darryl Weaver <[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/>.
+
+
+# Only run this as root
+if [ $EUID -ne 0 ]
+then
+	echo Execute as root or with \"sudo $0\"
+	exit 1
+fi
+
+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
+#Branch the cinder-ceph charm - required for openstack
+bzr branch lp:charms/cinder-ceph
+#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 Done. && echo
+
+echo "Charm store synced to directory /srv/charmstore/"