From 8a84ef9b153c4679d4965111e5a403a7b9a284be Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Thu, 21 Apr 2022 15:14:19 +0200 Subject: [PATCH] Make project network and subnet configurable (cherry picked from commit ad16b5a7fc3a0971b168b133fbf0b5cbd55115fd) --- zaza/openstack/charm_tests/neutron/setup.py | 2 ++ zaza/openstack/configure/network.py | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) 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,