Fixes
This commit is contained in:
parent
6dd05c38d7
commit
4e62fc8cbc
3
Makefile
3
Makefile
|
@ -14,7 +14,8 @@ test:
|
||||||
functional_test:
|
functional_test:
|
||||||
@echo Starting amulet tests...
|
@echo Starting amulet tests...
|
||||||
@tests/setup/00-setup
|
@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:
|
bin/charm_helpers_sync.py:
|
||||||
@mkdir -p bin
|
@mkdir -p bin
|
||||||
|
|
|
@ -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()
|
|
@ -124,7 +124,8 @@ class OpenStackAmuletDeployment(AmuletDeployment):
|
||||||
'ceph-osd', 'ceph-radosgw']
|
'ceph-osd', 'ceph-radosgw']
|
||||||
|
|
||||||
# Charms which can not use openstack-origin, ie. many subordinates
|
# 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:
|
if self.openstack:
|
||||||
for svc in services:
|
for svc in services:
|
||||||
|
|
Loading…
Reference in New Issue