Make project network and subnet configurable

(cherry picked from commit ad16b5a)
openstack-charmers · Jul 20, 2023 · 8a84ef9 · 8a84ef9
1 parent e13b6df
commit 8a84ef9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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,