Charm Helpers

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

  1. ceph-radosgw-osd-source
  2. Merge into devel
Proposed by Corey Bryant
Status: Merged
Merged at revision: 224
Proposed branch: lp:~corey.bryant/charm-helpers/ceph-radosgw-osd-source
Merge into: lp:charm-helpers
Diff against target: 23 lines (+4/-2)
1 file modified
charmhelpers/contrib/openstack/amulet/deployment.py (+4/-2)
To merge this branch: bzr merge lp:~corey.bryant/charm-helpers/ceph-radosgw-osd-source
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+236270@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Liam Young (gnuoy) wrote :

Approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/openstack/amulet/deployment.py'
2--- charmhelpers/contrib/openstack/amulet/deployment.py 2014-09-26 13:11:43 +0000
3+++ charmhelpers/contrib/openstack/amulet/deployment.py 2014-09-29 01:32:51 +0000
4@@ -16,7 +16,8 @@
5 self.openstack = openstack
6 self.source = source
7 self.stable = stable
8- # Note(coreycb): this needs to be changed when new next branches come out.
9+ # Note(coreycb): this needs to be changed when new next branches come
10+ # out.
11 self.current_next = "trusty"
12
13 def _determine_branch_locations(self, other_services):
14@@ -51,7 +52,8 @@
15
16 services = other_services
17 services.append(this_service)
18- use_source = ['mysql', 'mongodb', 'rabbitmq-server', 'ceph']
19+ use_source = ['mysql', 'mongodb', 'rabbitmq-server', 'ceph',
20+ 'ceph-osd', 'ceph-radosgw']
21
22 if self.openstack:
23 for svc in services:

Subscribers

People subscribed via source and target branches