From 4e62fc8cbc2197ea5610ceccf1fa285a72811090 Mon Sep 17 00:00:00 2001 From: Liam Young Date: Wed, 11 Nov 2015 19:54:58 +0000 Subject: [PATCH] Fixes --- Makefile | 3 ++- tests/018-basic-trusty-liberty | 11 +++++++++++ .../contrib/openstack/amulet/deployment.py | 3 ++- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100755 tests/018-basic-trusty-liberty diff --git a/Makefile b/Makefile index 5a3cd4b..4d5bc01 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,8 @@ test: functional_test: @echo Starting amulet tests... @tests/setup/00-setup - @juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700 + @juju test -v -p AMULET_ODL_LOCATION,AMULET_HTTP_PROXY,AMULET_OS_VIP \ + --timeout 2700 bin/charm_helpers_sync.py: @mkdir -p bin diff --git a/tests/018-basic-trusty-liberty b/tests/018-basic-trusty-liberty new file mode 100755 index 0000000..5f8c475 --- /dev/null +++ b/tests/018-basic-trusty-liberty @@ -0,0 +1,11 @@ +#!/usr/bin/python + +"""Amulet tests on a basic odl controller deployment on trusty-liberty.""" + +from basic_deployment import ODLControllerBasicDeployment + +if __name__ == '__main__': + deployment = ODLControllerBasicDeployment(series='trusty', + openstack='cloud:trusty-liberty', + source='cloud:trusty-updates/liberty') + deployment.run_tests() diff --git a/tests/charmhelpers/contrib/openstack/amulet/deployment.py b/tests/charmhelpers/contrib/openstack/amulet/deployment.py index e4ad62b..0506491 100644 --- a/tests/charmhelpers/contrib/openstack/amulet/deployment.py +++ b/tests/charmhelpers/contrib/openstack/amulet/deployment.py @@ -124,7 +124,8 @@ class OpenStackAmuletDeployment(AmuletDeployment): 'ceph-osd', 'ceph-radosgw'] # Charms which can not use openstack-origin, ie. many subordinates - no_origin = ['cinder-ceph', 'hacluster', 'neutron-openvswitch', 'nrpe'] + no_origin = ['cinder-ceph', 'hacluster', 'neutron-openvswitch', 'nrpe', + 'openvswitch-odl', 'neutron-api-odl', 'odl-controller'] if self.openstack: for svc in services: