arif/zaza-openstack-tests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make project network and subnet configurable

Browse Source
This commit is contained in:
Frode Nordahl
2022-04-21 15:14:19 +02:00
parent 3ec64703ed
commit ad16b5a7fc
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zaza/openstack/charm_tests/neutron/setup.py
View File

@@ -43,6 +43,8 @@ OVERCLOUD_NETWORK_CONFIG = {
"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 = {

6
zaza/openstack/configure/network.py
View File

@@ -164,14 +164,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,