openstack
/
charm-odl-controller
Code Issues Proposed changes

Normalize Narinders Be support, fixup amulet tests

This commit is contained in:
James Page 2016-02-19 14:23:05 +00:00
parent 3d9e30fef4 ddbc7c4a15
commit 097fbdf472
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hooks/odl_controller_utils.py
View File

@ -30,7 +30,38 @@ PROFILES = {
"openvswitch-odl-lithium": {
"feature:install": ["odl-ovsdb-openstack"],
"port": 8080
}
},
"openvswitch-odl-beryllium": {
"feature:install": ["odl-ovsdb-openstack",
"odl-restconf",
"odl-aaa-authn",
"odl-dlux-all"],
"port": 8080
},
"openvswitch-odl-beryllium-l3": {
"feature:install": ["odl-ovsdb-openstack"],
"port": 8080
},
"openvswitch-odl-beryllium-sfc": {
"feature:install": ["odl-ovsdb-openstack",
"odl-sfc-core",
"odl-sfc-sb-rest",
"odl-sfc-ui",
"odl-sfc-netconf",
"odl-sfc-ovs",
"odl-sfcofl2",
"odl-sfc-test-consumer"],
"port": 8080
},
"openvswitch-odl-beryllium-vpn": {
"feature:install": ["odl-ovsdb-openstack",
"odl-vpnservice-api",
"odl-vpnservice-impl",
"odl-vpnservice-impl-rest",
"odl-vpnservice-impl-ui",
"odl-vpnservice-core"],
"port": 8080
},
}
PROFILES["default"] = PROFILES["openvswitch-odl"]

4
tests/basic_deployment.py
View File

@ -122,7 +122,7 @@ class ODLControllerBasicDeployment(OpenStackAmuletDeployment):
os.environ['AMULET_HTTP_PROXY']
keystone_config = {'admin-password': 'openstack',
'admin-token': 'ubuntutesting'}
nova_cc_config = {'network-manager': 'Quantum',
nova_cc_config = {'network-manager': 'Neutron',
'quantum-security-groups': 'yes'}
configs = {'neutron-gateway': neutron_gateway_config,
'neutron-api': neutron_api_config,
@ -267,7 +267,7 @@ class ODLControllerBasicDeployment(OpenStackAmuletDeployment):
'tenantId': u.not_null,
'id': u.not_null,
'email': 'juju@localhost'},
{'name': 'quantum',
{'name': 'neutron',
'enabled': True,
'tenantId': u.not_null,
'id': u.not_null,