Merge lp:~hopem/charms/precise/glance/python-redux.lp1227008 into lp:~openstack-charmers/charms/precise/glance/python-redux

[Edward Hope-Morley]

=== modified file 'config.yaml'
--- config.yaml	2013-06-20 18:26:12 +0000
+++ config.yaml	2013-09-24 17:11:29 +0000
@@ -26,6 +26,16 @@
     default: RegionOne
     type: string
     description: OpenStack Region
+  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).
   # HA configuration settings
   vip:
     type: string

=== modified file 'hooks/glance_relations.py'
--- hooks/glance_relations.py	2013-09-24 16:00:52 +0000
+++ hooks/glance_relations.py	2013-09-24 17:11:29 +0000
@@ -150,7 +150,9 @@
         juju_log('ceph relation incomplete. Peer not ready?')
         return
 
-    if not ensure_ceph_keyring(service=service_name(),
+    service = service_name()
+
+    if not ensure_ceph_keyring(service=service,
                                user='glance', group='glance'):
         juju_log('Could not create ceph keyring: peer not ready?')
         return
@@ -159,7 +161,9 @@
     CONFIGS.write(CEPH_CONF)
 
     if eligible_leader(CLUSTER_RES):
-        ensure_ceph_pool(service=service_name())
+        _config = config()
+        ensure_ceph_pool(service=service,
+                         replicas=_config['ceph-osd-replication-count'])
 
 
 @hooks.hook('identity-service-relation-joined')

=== modified file 'hooks/glance_utils.py'
--- hooks/glance_utils.py	2013-09-23 18:46:48 +0000
+++ hooks/glance_utils.py	2013-09-24 17:11:29 +0000
@@ -126,11 +126,11 @@
     subprocess.check_call(cmd)
 
 
-def ensure_ceph_pool(service):
+def ensure_ceph_pool(service, replicas):
     '''Creates a ceph pool for service if one does not exist'''
     # TODO: Ditto about moving somewhere sharable.
     if not ceph_pool_exists(service=service, name=service):
-        ceph_create_pool(service=service, name=service)
+        ceph_create_pool(service=service, name=service, replicas=replicas)
 
 
 def do_openstack_upgrade(configs):

=== modified file 'revision'
--- revision	2013-08-16 21:22:59 +0000
+++ revision	2013-09-24 17:11:29 +0000
@@ -1,1 +1,1 @@
-144
+145

=== modified file 'unit_tests/test_glance_relations.py'
--- unit_tests/test_glance_relations.py	2013-09-20 15:52:45 +0000
+++ unit_tests/test_glance_relations.py	2013-09-24 17:11:29 +0000
@@ -222,7 +222,8 @@
         self.assertEquals([call('/etc/glance/glance-api.conf'),
                            call('/etc/ceph/ceph.conf')],
                            configs.write.call_args_list)
-        self.ensure_ceph_pool.assert_called_with(service=self.service_name())
+        self.ensure_ceph_pool.assert_called_with(service=self.service_name(),
+                                                 replicas=2)
 
     def test_keystone_joined_not_leader(self):
         self.eligible_leader.return_value = False