From 6a773aa66481fdc1aa876e5c73de8fc09bf25126 Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Fri, 16 Oct 2015 15:31:50 +0000 Subject: [PATCH] wait for workload status before testing; add service and relations to satisfy workload status. --- tests/basic_deployment.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index a1cb035d..7544eb92 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -1,5 +1,3 @@ -#!/usr/bin/python - import amulet import os import time @@ -47,7 +45,9 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment): other_services = [{'name': 'mysql'}, {'name': 'rabbitmq-server'}, {'name': 'keystone'}, + {'name': 'glance'}, # satisfy workload status {'name': 'nova-cloud-controller'}, + {'name': 'nova-compute'}, # satisfy workload stat {'name': 'neutron-api'}] super(NeutronGatewayBasicDeployment, self)._add_services( @@ -68,7 +68,15 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment): 'neutron-api:shared-db': 'mysql:shared-db', 'neutron-api:amqp': 'rabbitmq-server:amqp', '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)