← Back to branch summary

~chris.macnaughton/charms/trusty/ceph-osd/storage-hooks

« back to all changes in this revision

Viewing changes to tests/basic_deployment.py

  • Committer: Chris MacNaughton
  • Date: 2016-02-18 14:12:13 UTC
  • mfrom: (60.2.3 ceph-osd)
  • Revision ID: chris.macnaughton@canonical.com-20160218141213-fsoaxqudb2qx2gl9
Resolve conflict with get_devices

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/basic_deployment.py
27
27
        self._add_relations()
28
28
        self._configure_services()
29
29
        self._deploy()
 
30
 
 
31
        u.log.info('Waiting on extended status checks...')
 
32
        exclude_services = ['mysql']
 
33
 
 
34
        # Wait for deployment ready msgs, except exclusions
 
35
        self._auto_wait_for_status(exclude_services=exclude_services)
 
36
 
30
37
        self._initialize_tests()
31
38
 
32
39
    def _add_services(self):
114
121
        u.log.debug('openstack release str: {}'.format(
115
122
            self._get_openstack_release_string()))
116
123
 
117
 
        # Let things settle a bit original moving forward
118
 
        time.sleep(30)
119
 
 
120
124
        # Authenticate admin with keystone
121
125
        self.keystone = u.authenticate_keystone_admin(self.keystone_sentry,
122
126
                                                      user='admin',