Merge lp:~james-page/charms/quantal/glance/ceph-integration into lp:~charmers/charms/quantal/glance/trunk

[James Page]

Support for use of Ceph RADOS object storage for glance.

[lp:~james-page/charms/quantal/glance/ceph-integration]

27. By James Page on 2012-10-25

Added support for auth configuration from ceph

=== added symlink 'hooks/ceph-relation-changed'
=== target is u'glance-relations'
=== added symlink 'hooks/ceph-relation-joined'
=== target is u'glance-relations'
=== modified file 'hooks/glance-relations'
--- hooks/glance-relations	2012-06-19 23:09:07 +0000
+++ hooks/glance-relations	2012-10-25 06:35:11 +0000
@@ -86,6 +86,55 @@
   glance_ctl glance-api restart
 }
 
+
+function ceph_joined {
+  mkdir -p /etc/ceph
+  apt-get -y install ceph-common python-ceph || exit 1
+}
+
+function ceph_changed {
+  SERVICE_NAME=`echo $JUJU_UNIT_NAME | cut -d / -f 1`
+  KEYRING=/etc/ceph/ceph.client.$SERVICE_NAME.keyring
+  KEY=`relation-get key`
+  if [ -n "$KEY" ]; then
+    # But only once
+    if [ ! -f $KEYRING ]; then
+      ceph-authtool $KEYRING \
+        --create-keyring --name=client.$SERVICE_NAME \
+        --add-key="$KEY"
+      chmod +r $KEYRING
+    fi
+  else
+    # No key - bail for the time being
+    exit 0
+  fi
+
+  MONS=`relation-list`
+  mon_hosts=""
+  for mon in $MONS; do
+    mon_hosts="$mon_hosts `relation-get private-address $mon`:6789"
+  done
+  cat > /etc/ceph/ceph.conf << EOF
+[global]
+ auth supported = $(relation-get auth)
+ keyring = /etc/ceph/\$cluster.\$name.keyring
+ mon host = $mon_hosts
+EOF
+
+  # Create the images pool if it does not already exist
+  if ! rados --id $SERVICE_NAME lspools | grep -q images; then
+    rados --id $SERVICE_NAME mkpool images
+  fi
+
+  # Configure glance for ceph storage options
+  set_or_update default_store rbd api
+  set_or_update rbd_store_ceph_conf /etc/ceph/ceph.conf api
+  set_or_update rbd_store_user $SERVICE_NAME api
+  set_or_update rbd_store_pool images api
+  set_or_update rbd_store_chunk_size 8 api
+  glance_ctl glance-api restart
+}
+
 function keystone_joined {
   # advertise our API endpoint to keystone
   url="http://$(unit-get private-address):9292/v1"
@@ -138,5 +187,7 @@
   "object-store-relation-changed") object-store_changed ;;
   "identity-service-relation-joined") keystone_joined ;;
   "identity-service-relation-changed") keystone_changed ;;
+  "ceph-relation-joined") ceph_joined;;
+  "ceph-relation-changed") ceph_changed;;
 esac
 

=== modified file 'metadata.yaml'
--- metadata.yaml	2012-06-07 17:53:19 +0000
+++ metadata.yaml	2012-10-25 06:35:11 +0000
@@ -17,3 +17,5 @@
     interface: swift
   identity-service:
     interface: keystone
+  ceph:
+    interface: ceph-client