[1chb1n, r=thedac] wait for unit status and turn on releases for amulet tests
This commit is contained in:
commit
1861bfea42
|
@ -6,7 +6,6 @@ Basic keystone amulet functional tests.
|
||||||
|
|
||||||
import amulet
|
import amulet
|
||||||
import os
|
import os
|
||||||
import time
|
|
||||||
import yaml
|
import yaml
|
||||||
|
|
||||||
from charmhelpers.contrib.openstack.amulet.deployment import (
|
from charmhelpers.contrib.openstack.amulet.deployment import (
|
||||||
|
@ -36,6 +35,11 @@ class KeystoneBasicDeployment(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']
|
||||||
|
self._auto_wait_for_status(exclude_services=exclude_services)
|
||||||
|
|
||||||
self._initialize_tests()
|
self._initialize_tests()
|
||||||
|
|
||||||
def _assert_services(self, should_run):
|
def _assert_services(self, should_run):
|
||||||
|
@ -52,6 +56,7 @@ class KeystoneBasicDeployment(OpenStackAmuletDeployment):
|
||||||
"""
|
"""
|
||||||
this_service = {'name': 'keystone'}
|
this_service = {'name': 'keystone'}
|
||||||
other_services = [{'name': 'mysql'},
|
other_services = [{'name': 'mysql'},
|
||||||
|
{'name': 'rabbitmq-server'}, # satisfy wrkload stat
|
||||||
{'name': 'cinder'}]
|
{'name': 'cinder'}]
|
||||||
super(KeystoneBasicDeployment, self)._add_services(this_service,
|
super(KeystoneBasicDeployment, self)._add_services(this_service,
|
||||||
other_services)
|
other_services)
|
||||||
|
@ -59,6 +64,8 @@ class KeystoneBasicDeployment(OpenStackAmuletDeployment):
|
||||||
def _add_relations(self):
|
def _add_relations(self):
|
||||||
"""Add all of the relations for the services."""
|
"""Add all of the relations for the services."""
|
||||||
relations = {'keystone:shared-db': 'mysql:shared-db',
|
relations = {'keystone:shared-db': 'mysql:shared-db',
|
||||||
|
'cinder:shared-db': 'mysql:shared-db',
|
||||||
|
'cinder:amqp': 'rabbitmq-server:amqp',
|
||||||
'cinder:identity-service': 'keystone:identity-service'}
|
'cinder:identity-service': 'keystone:identity-service'}
|
||||||
super(KeystoneBasicDeployment, self)._add_relations(relations)
|
super(KeystoneBasicDeployment, self)._add_relations(relations)
|
||||||
|
|
||||||
|
@ -113,9 +120,6 @@ class KeystoneBasicDeployment(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 before moving forward
|
|
||||||
time.sleep(30)
|
|
||||||
|
|
||||||
# Authenticate keystone admin
|
# Authenticate keystone admin
|
||||||
self.keystone = u.authenticate_keystone_admin(self.keystone_sentry,
|
self.keystone = u.authenticate_keystone_admin(self.keystone_sentry,
|
||||||
user='admin',
|
user='admin',
|
||||||
|
|
Loading…
Reference in New Issue