Normalize Narinders Be support, fixup amulet tests
This commit is contained in:
commit
097fbdf472
@ -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"]
|
||||
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user