openstack/charm-ceph-radosgw
Code Issues Proposed changes

Update amulet test definitions; Wait for workload status before testing.

Browse Source
This commit is contained in:
Ryan Beisner 2016-02-12 21:43:28 +00:00
parent bff5923c60
commit 16f32b3cc6
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
tests/018-basic-trusty-liberty Normal file → Executable file
View File

0
tests/019-basic-trusty-mitaka Normal file → Executable file
View File

0
tests/020-basic-wily-liberty Normal file → Executable file
View File

11
tests/basic_deployment.py
View File

@ -1,7 +1,6 @@
#!/usr/bin/python #!/usr/bin/python
import amulet import amulet
import time
from charmhelpers.contrib.openstack.amulet.deployment import ( from charmhelpers.contrib.openstack.amulet.deployment import (
OpenStackAmuletDeployment OpenStackAmuletDeployment
) )
@ -26,6 +25,13 @@ class CephRadosGwBasicDeployment(OpenStackAmuletDeployment):
self._add_relations() self._add_relations()
self._configure_services() self._configure_services()
self._deploy() self._deploy()
u.log.info('Waiting on extended status checks...')
exclude_services = ['mysql']
# Wait for deployment ready msgs, except exclusions
self._auto_wait_for_status(exclude_services=exclude_services)
self._initialize_tests() self._initialize_tests()
def _add_services(self): def _add_services(self):
@ -108,9 +114,6 @@ class CephRadosGwBasicDeployment(OpenStackAmuletDeployment):
u.log.debug('openstack release str: {}'.format( u.log.debug('openstack release str: {}'.format(
self._get_openstack_release_string())) self._get_openstack_release_string()))
# Let things settle a bit original moving forward
time.sleep(30)
# Authenticate admin with keystone # Authenticate admin with keystone
self.keystone = u.authenticate_keystone_admin(self.keystone_sentry, self.keystone = u.authenticate_keystone_admin(self.keystone_sentry,
user='admin', user='admin',