Merge lp:~james-page/charms/precise/cinder/hook-fixup into lp:charms/raring/cinder

[James Page]

Charm currently does not deploy due to syntax error in hooks case statement.

[lp:~james-page/charms/precise/cinder/hook-fixup]

19. By James Page on 2012-12-05

Add future fix for move to start-stop-daemon in grizzly

[Adam Gandelman (gandelman-a)]

review: Approve

=== modified file 'hooks/cinder-common'
--- hooks/cinder-common	2012-11-28 17:45:31 +0000
+++ hooks/cinder-common	2012-12-05 17:45:26 +0000
@@ -2,7 +2,7 @@
 
 CHARM="cinder"
 
-COMMON_PACKAGES="cinder-common python-mysqldb"
+COMMON_PACKAGES="cinder-common python-mysqldb gdisk"
 API_PACKAGES="cinder-api"
 VOL_PACKAGES="cinder-volume"
 SCHED_PACKAGES="cinder-scheduler"
@@ -124,6 +124,10 @@
     fi
     echo "yes" | pvremove -ff "$block_dev" ||
       error_out "Could not pvremove $block_dev"
+  else
+    juju-log "Zapping disk of all GPT and MBR structures"
+    sgdisk --zap-all $block_dev ||
+      error_out "Unable to zap $block_dev"
   fi
 }
 

=== modified file 'hooks/cinder-hooks'
--- hooks/cinder-hooks	2012-11-29 20:00:26 +0000
+++ hooks/cinder-hooks	2012-12-05 17:45:26 +0000
@@ -153,6 +153,9 @@
   # XXX: Horrid kludge to make cinder-volume use
   # a different ceph username than admin
   echo "CEPH_ARGS=--id $SERVICE_NAME" >> /etc/environment
+  # Also add it to the overrides for cinder volume
+  # in preparation for move to start-stop-daemon.
+  echo "env CEPH_ARGS=\"--id $SERVICE_NAME\"" > /etc/init/cinder-volume.override
 
   # Create the cinder pool if it does not already exist
   if ! rados --id $SERVICE_NAME lspools | grep -q cinder; then
@@ -169,8 +172,8 @@
 juju-log "cinder: Attempting to fire hook for: $arg0"
 case $arg0 in
   "install") install_hook ;;
-  "start") cinder_ctl all start
-  "stop") cinder_ctl all stop
+  "start") cinder_ctl all start;;
+  "stop") cinder_ctl all stop;;
   "shared-db-relation-joined") db_joined ;;
   "shared-db-relation-changed") db_changed ;;
   "amqp-relation-joined") amqp_joined ;;

=== modified file 'revision'
--- revision	2012-11-29 00:04:15 +0000
+++ revision	2012-12-05 17:45:26 +0000
@@ -1,1 +1,1 @@
-1
+2