openstack
/
charm-ceph-proxy
Code Issues Proposed changes

Sync charm-helpers and fix lint errors.

This commit is contained in:
Corey Bryant 2014-09-29 20:41:39 +00:00
parent e4997e2eb8
commit d164e74bdc
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/basic_deployment.py
View File

@ -19,7 +19,8 @@ class CephBasicDeployment(OpenStackAmuletDeployment):
def __init__(self, series=None, openstack=None, source=None, stable=False):
"""Deploy the entire test environment."""
super(CephBasicDeployment, self).__init__(series, openstack, source, stable)
super(CephBasicDeployment, self).__init__(series, openstack, source,
stable)
self._add_services()
self._add_relations()
self._configure_services()

6
tests/charmhelpers/contrib/openstack/amulet/deployment.py
View File

@ -16,7 +16,8 @@ class OpenStackAmuletDeployment(AmuletDeployment):
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 @@ class OpenStackAmuletDeployment(AmuletDeployment):
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: