Merge trunk

README.md

@@ -123,14 +123,16 @@ Deploying from source
 
 The minimum openstack-origin-git config required to deploy from source is:
 
-  openstack-origin-git:
-      "repositories:
-         - {name: requirements,
-            repository: 'git://git.openstack.org/openstack/requirements',
-            branch: stable/juno}
-         - {name: cinder,
-            repository: 'git://git.openstack.org/openstack/cinder',
-            branch: stable/juno}"
+    openstack-origin-git: include-file://cinder-juno.yaml
+
+    cinder-juno.yaml
+        repositories:
+        - {name: requirements,
+           repository: 'git://github.com/openstack/requirements',
+           branch: stable/juno}
+        - {name: cinder,
+           repository: 'git://github.com/openstack/cinder',
+           branch: stable/juno}
 
 Note that there are only two 'name' values the charm knows about: 'requirements'
 and 'cinder'. These repositories must correspond to these 'name' values.
@@ -140,71 +142,73 @@ in the order in which they are specified.
 
 The following is a full list of current tip repos (may not be up-to-date):
 
-  openstack-origin-git:
-      "repositories:
-         - {name: requirements,
-            repository: 'git://git.openstack.org/openstack/requirements',
-            branch: master}
-         - {name: oslo-concurrency,
-            repository: 'git://git.openstack.org/openstack/oslo.concurrency',
-            branch: master}
-         - {name: oslo-config,
-            repository: 'git://git.openstack.org/openstack/oslo.config',
-            branch: master}
-         - {name: oslo-context,
-            repository': 'git://git.openstack.org/openstack/oslo.context.git',
-            branch: master}
-         - {name: oslo-db,
-            repository: 'git://git.openstack.org/openstack/oslo.db',
-            branch: master}
-         - {name: oslo-i18n,
-            repository: 'git://git.openstack.org/openstack/oslo.i18n',
-            branch: master}
-         - {name: oslo-messaging,
-            repository: 'git://git.openstack.org/openstack/oslo.messaging.git',
-            branch: master}
-         - {name: oslo-serialization,
-            repository: 'git://git.openstack.org/openstack/oslo.serialization',
-            branch: master}
-         - {name: oslo-utils,
-            repository: 'git://git.openstack.org/openstack/oslo.utils',
-            branch: master}
-         - {name: oslo-rootwrap,
-            repository: 'git://git.openstack.org/openstack/oslo.rootwrap.git',
-            branch: master}
-         - {name: oslo-vmware,
-            repository: 'git://git.openstack.org/openstack/oslo.vmware.git',
-            branch: master}
-         - {name: osprofiler,
-            repository: 'git://git.openstack.org/stackforge/osprofiler.git',
-            branch: master}
-         - {name: pbr,
-            repository: 'git://git.openstack.org/openstack-dev/pbr',
-            branch: master}
-         - {name: python-barbicanclient,
-            repository: 'git://git.openstack.org/openstack/python-barbicanclient.git',
-            branch: master}
-         - {name: python-glanceclient,
-            repository: 'git://git.openstack.org/openstack/python-glanceclient.git',
-            branch: master}
-         - {name: python-novaclient,
-            repository: 'git://git.openstack.org/openstack/python-novaclient.git',
-            branch: master}
-         - {name: python-swiftclient:
-            repository: 'git://git.openstack.org/openstack/python-swiftclient.git',
-            branch: master}
-         - {name: sqlalchemy-migrate,
-            repository: 'git://git.openstack.org/stackforge/sqlalchemy-migrate',
-            branch: master}
-         - {name: stevedore,
-            repository: 'git://git.openstack.org/openstack/stevedore.git',
-            branch: master}
-         - {name: taskflow,
-            repository: 'git://git.openstack.org/openstack/taskflow.git',
-            branch: master}
-         - {name: keystonemiddleware,
-            repository: 'git://git.openstack.org/openstack/keystonemiddleware',
-            branch: master}
-         - {name: cinder,
-            repository: 'git://git.openstack.org/openstack/cinder',
-            branch: master}"
+    openstack-origin-git: include-file://cinder-master.yaml
+
+    cinder-master.yaml
+        repositories:
+        - {name: requirements,
+           repository: 'git://github.com/openstack/requirements',
+           branch: master}
+        - {name: oslo-concurrency,
+           repository: 'git://github.com/openstack/oslo.concurrency',
+           branch: master}
+        - {name: oslo-config,
+           repository: 'git://github.com/openstack/oslo.config',
+           branch: master}
+        - {name: oslo-context,
+           repository': 'git://github.com/openstack/oslo.context',
+           branch: master}
+        - {name: oslo-db,
+           repository: 'git://github.com/openstack/oslo.db',
+           branch: master}
+        - {name: oslo-i18n,
+           repository: 'git://github.com/openstack/oslo.i18n',
+           branch: master}
+        - {name: oslo-messaging,
+           repository: 'git://github.com/openstack/oslo.messaging',
+           branch: master}
+        - {name: oslo-serialization,
+           repository: 'git://github.com/openstack/oslo.serialization',
+           branch: master}
+        - {name: oslo-utils,
+           repository: 'git://github.com/openstack/oslo.utils',
+           branch: master}
+        - {name: oslo-rootwrap,
+           repository: 'git://github.com/openstack/oslo.rootwrap',
+           branch: master}
+        - {name: oslo-vmware,
+           repository: 'git://github.com/openstack/oslo.vmware',
+           branch: master}
+        - {name: osprofiler,
+           repository: 'git://github.com/stackforge/osprofiler',
+           branch: master}
+        - {name: pbr,
+           repository: 'git://github.com/openstack-dev/pbr',
+           branch: master}
+        - {name: python-barbicanclient,
+           repository: 'git://github.com/openstack/python-barbicanclient',
+           branch: master}
+        - {name: python-glanceclient,
+           repository: 'git://github.com/openstack/python-glanceclient',
+           branch: master}
+        - {name: python-novaclient,
+           repository: 'git://github.com/openstack/python-novaclient',
+           branch: master}
+        - {name: python-swiftclient:
+           repository: 'git://github.com/openstack/python-swiftclient',
+           branch: master}
+        - {name: sqlalchemy-migrate,
+           repository: 'git://github.com/stackforge/sqlalchemy-migrate',
+           branch: master}
+        - {name: stevedore,
+           repository: 'git://github.com/openstack/stevedore',
+           branch: master}
+        - {name: taskflow,
+           repository: 'git://github.com/openstack/taskflow',
+           branch: master}
+        - {name: keystonemiddleware,
+           repository: 'git://github.com/openstack/keystonemiddleware',
+           branch: master}
+        - {name: cinder,
+           repository: 'git://github.com/openstack/cinder',
+           branch: master}

hooks/cinder_hooks.py

@@ -18,6 +18,7 @@ from cinder_utils import (
     restart_map,
     services,
     service_enabled,
+    service_restart,
     set_ceph_env_variables,
     CLUSTER_RES,
     CINDER_CONF,
@@ -334,6 +335,9 @@ def ceph_changed(relation_id=None):
         set_ceph_env_variables(service=service)
         CONFIGS.write(CINDER_CONF)
         CONFIGS.write(ceph_config_file())
+        # Ensure that cinder-volume is restarted since only now can we
+        # guarantee that ceph resources are ready.
+        service_restart('cinder-volume')
     else:
         rq = CephBrokerRq()
         replicas = config('ceph-osd-replication-count')