openstack
/
charm-odl-controller
Code Issues Proposed changes

Fixes

This commit is contained in:
Liam Young 2015-11-11 19:54:58 +00:00
parent 6dd05c38d7
commit 4e62fc8cbc
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -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

11
tests/018-basic-trusty-liberty Executable file
View File

@ -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()

3
tests/charmhelpers/contrib/openstack/amulet/deployment.py
View File

@ -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: