diff --git a/zaza/openstack/charm_tests/neutron/setup.py b/zaza/openstack/charm_tests/neutron/setup.py index 6fd13c783..1402c8fef 100644 --- a/zaza/openstack/charm_tests/neutron/setup.py +++ b/zaza/openstack/charm_tests/neutron/setup.py @@ -43,6 +43,8 @@ "prefix_len": "24", "subnetpool_name": "pooled_subnets", "subnetpool_prefix": "192.168.0.0/16", + "project_net_name": "private", + "project_subnet_name": "private_subnet", } OVERCLOUD_PROVIDER_VLAN_NETWORK_CONFIG = { diff --git a/zaza/openstack/configure/network.py b/zaza/openstack/configure/network.py index 0876668f5..d3bc5f736 100755 --- a/zaza/openstack/configure/network.py +++ b/zaza/openstack/configure/network.py @@ -166,14 +166,16 @@ def setup_sdn(network_config, keystone_session=None): neutron_client, project_id, shared=False, - network_type=network_config["network_type"]) + network_type=network_config["network_type"], + net_name=network_config["project_net_name"]) project_subnet = openstack_utils.create_project_subnet( neutron_client, project_id, project_network, network_config.get("private_net_cidr"), subnetpool=subnetpool, - ip_version=ip_version) + ip_version=ip_version, + subnet_name=network_config["project_subnet_name"]) openstack_utils.update_subnet_dns( neutron_client, project_subnet,