openstack/charm-neutron-gateway
Code Issues Proposed changes

wait for workload status before testing; add service and relations to satisfy workload status.

Browse Source
This commit is contained in:
Ryan Beisner 2015-10-16 15:31:50 +00:00
parent 2482762f96
commit 6a773aa664
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/basic_deployment.py
View File

@ -1,5 +1,3 @@
#!/usr/bin/python
import amulet import amulet
import os import os
import time import time
@ -47,7 +45,9 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
other_services = [{'name': 'mysql'}, other_services = [{'name': 'mysql'},
{'name': 'rabbitmq-server'}, {'name': 'rabbitmq-server'},
{'name': 'keystone'}, {'name': 'keystone'},
{'name': 'glance'}, # satisfy workload status
{'name': 'nova-cloud-controller'}, {'name': 'nova-cloud-controller'},
{'name': 'nova-compute'}, # satisfy workload stat
{'name': 'neutron-api'}] {'name': 'neutron-api'}]
super(NeutronGatewayBasicDeployment, self)._add_services( super(NeutronGatewayBasicDeployment, self)._add_services(
@ -68,7 +68,15 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
'neutron-api:shared-db': 'mysql:shared-db', 'neutron-api:shared-db': 'mysql:shared-db',
'neutron-api:amqp': 'rabbitmq-server:amqp', 'neutron-api:amqp': 'rabbitmq-server:amqp',
'neutron-api:neutron-api': 'nova-cloud-controller:neutron-api', 'neutron-api:neutron-api': 'nova-cloud-controller:neutron-api',
'neutron-api:identity-service': 'keystone:identity-service' 'neutron-api:identity-service': 'keystone:identity-service',
'glance:identity-service': 'keystone:identity-service',
'glance:shared-db': 'mysql:shared-db',
'glance:amqp': 'rabbitmq-server:amqp',
'nova-cloud-controller:cloud-compute': 'nova-compute:'
'cloud-compute',
'nova-compute:amqp': 'rabbitmq-server:amqp',
'nova-compute:image-service': 'glance:image-service',
'nova-cloud-controller:image-service': 'glance:image-service',
} }
super(NeutronGatewayBasicDeployment, self)._add_relations(relations) super(NeutronGatewayBasicDeployment, self)._add_relations(relations)