Merge lp:~hopem/charms/precise/glance/lp1227008 into lp:~charmers/charms/precise/glance/trunk

[Edward Hope-Morley]

[lp:~hopem/charms/precise/glance/lp1227008]

37. By Edward Hope-Morley on 2013-09-18

* bumped version
* filtered out extra newline char in output of 'ceph osd ls'

=== modified file 'config.yaml'
--- config.yaml	2013-02-14 23:21:43 +0000
+++ config.yaml	2013-09-18 18:41:38 +0000
@@ -60,3 +60,14 @@
   ssl_key:
     type: string
     description: SSL key to use with certificate specified as ssl_cert.
+  ceph-osd-replication-count:
+        default: 2
+        type: int
+        description: |
+            This value dictates the number of replicas ceph must make of any
+            object it stores within the images rbd pool. Of course, this only
+            applies if using Ceph as a backend store. Note that once the images
+            rbd pool has been created, changing this value will not have any
+            effect (although it can be changed in ceph by manually configuring
+            your ceph cluster).
+

=== modified file 'hooks/glance-relations'
--- hooks/glance-relations	2013-06-03 20:08:45 +0000
+++ hooks/glance-relations	2013-09-18 18:41:38 +0000
@@ -179,7 +179,18 @@
 
   # 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
+      local num_osds=$(ceph --id $SERVICE_NAME osd ls| egrep "[^\s]"| wc -l)
+      local cfg_key='ceph-osd-replication-count'
+      local rep_count="$(config-get $cfg_key)"
+      if [ -z "$rep_count" ]
+      then
+          rep_count=2
+          juju-log "config returned empty string for $cfg_key - using value of 2"
+      fi
+      local num_pgs=$(((num_osds*100)/rep_count))
+      ceph --id $SERVICE_NAME osd pool create images $num_pgs $num_pgs
+      ceph --id $SERVICE_NAME osd pool set images size $rep_count
+      # TODO: set appropriate crush ruleset
   fi
 
   # Configure glance for ceph storage options

=== modified file 'revision'
--- revision	2013-06-03 20:08:45 +0000
+++ revision	2013-09-18 18:41:38 +0000
@@ -1,1 +1,1 @@
-143
+144