Merge lp:~james-page/charms/quantal/glance/ceph-integration into lp:~charmers/charms/precise/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

Unmerged revisions

=== modified file 'config.yaml'
--- config.yaml	2011-12-16 01:26:01 +0000
+++ config.yaml	2012-10-11 15:59:24 +0000
@@ -15,7 +15,7 @@
     default: glance
     type: string
     description: Database username
-  nova-db:
-    default: nova
+  glance-db:
+    default: glance
     type: string
-    description: Nova database name
+    description: Glance database name.

=== added file 'copyright'
--- copyright	1970-01-01 00:00:00 +0000
+++ copyright	2012-10-11 15:59:24 +0000
@@ -0,0 +1,17 @@
+Format: http://dep.debian.net/deps/dep5/
+
+Files: *
+Copyright: Copyright 2012, Canonical Ltd., All Rights Reserved.
+License: GPL-3
+ 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, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ 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/>.

=== renamed file 'copyright' => 'copyright.moved'
=== removed file 'glance.yaml'
--- glance.yaml	2011-12-16 01:26:01 +0000
+++ glance.yaml	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-glance:
-  glance-release: trunk
-  registry-config: /etc/glance/glance-registry.conf
-  api-config: /etc/glance/glance-api.conf
-  db-user: glance
-  nova-db: nova

=== 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-common'
--- hooks/glance-common	2012-03-02 20:45:12 +0000
+++ hooks/glance-common	2012-10-11 15:59:24 +0000
@@ -9,7 +9,7 @@
 GLANCE_API_PASTE_INI="/etc/glance/glance-api-paste.ini"
 
 DB_USER=$(config-get db-user)
-NOVA_DB=$(config-get nova-db)
+GLANCE_DB=$(config-get glance-db)
 PPA=$(config-get glance-release)
 
 HOSTNAME=`hostname -f`

=== modified file 'hooks/glance-relations'
--- hooks/glance-relations	2012-04-13 22:46:42 +0000
+++ hooks/glance-relations	2012-10-11 15:59:24 +0000
@@ -35,8 +35,8 @@
 }
 
 function db_joined {
-  juju-log "glance: db_joined: requesting access to $NOVA_DB for $DB_USER@`unit-get private-address`"
-  relation-set database=$NOVA_DB
+  juju-log "glance: db_joined: requesting access to $GLANCE_DB for $DB_USER@`unit-get private-address`"
+  relation-set database=$GLANCE_DB
   relation-set username=$DB_USER
   relation-set hostname=`unit-get private-address`
 }
@@ -50,9 +50,10 @@
   else
     echo "db_changed: Received password from $DB_HOST"
   fi
-  juju-log "glance: db_changed: Configuring registry for access to $NOVA_DB@$DB_HOST"
+  juju-log "glance: db_changed: Configuring registry for access to $GLANCE_DB@$DB_HOST"
   glance_ctl all stop
-  set_or_update sql_connection "mysql://$DB_USER:$DB_PASSWORD@$DB_HOST/$NOVA_DB" registry
+  set_or_update sql_connection "mysql://$DB_USER:$DB_PASSWORD@$DB_HOST/$GLANCE_DB" registry
+  set_or_update sql_connection "mysql://$DB_USER:$DB_PASSWORD@$DB_HOST/$GLANCE_DB" api
   # Set the db version to 0 if its not under version control. We assume that any existing
   # database we are being related to was created WITH version control.
   if ! glance-manage db_version ; then
@@ -85,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 = cephx
+ 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"
@@ -137,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-11 15:59:24 +0000
@@ -17,3 +17,5 @@
     interface: swift
   identity-service:
     interface: keystone
+  ceph:
+    interface: ceph-client