Merge lp:~corey.bryant/charm-helpers/ceph-radosgw-osd-source into lp:charm-helpers

[Corey Bryant]

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'charmhelpers/contrib/openstack/amulet/deployment.py'
--- charmhelpers/contrib/openstack/amulet/deployment.py	2014-09-26 13:11:43 +0000
+++ charmhelpers/contrib/openstack/amulet/deployment.py	2014-09-29 01:32:51 +0000
@@ -16,7 +16,8 @@
         self.openstack = openstack
         self.source = source
         self.stable = stable
-        # Note(coreycb): this needs to be changed when new next branches come out.
+        # Note(coreycb): this needs to be changed when new next branches come
+        # out.
         self.current_next = "trusty"
 
     def _determine_branch_locations(self, other_services):
@@ -51,7 +52,8 @@
 
         services = other_services
         services.append(this_service)
-        use_source = ['mysql', 'mongodb', 'rabbitmq-server', 'ceph']
+        use_source = ['mysql', 'mongodb', 'rabbitmq-server', 'ceph',
+                      'ceph-osd', 'ceph-radosgw']
 
         if self.openstack:
             for svc in services: