summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/deploy/deploy.sh1
-rw-r--r--deploy/config/vm_environment/zte-virtual1/network.yml1
-rw-r--r--deploy/config/vm_environment/zte-virtual2/network.yml1
-rw-r--r--deploy/post/execute.py7
4 files changed, 6 insertions, 4 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh
index cc759149..6c88dc5a 100755
--- a/ci/deploy/deploy.sh
+++ b/ci/deploy/deploy.sh
@@ -375,7 +375,6 @@ fi
echo "====== deploy successfully ======"
exit 0
-
#
# END of main
############################################################################
diff --git a/deploy/config/vm_environment/zte-virtual1/network.yml b/deploy/config/vm_environment/zte-virtual1/network.yml
index 6c8a2824..34b466a2 100644
--- a/deploy/config/vm_environment/zte-virtual1/network.yml
+++ b/deploy/config/vm_environment/zte-virtual1/network.yml
@@ -33,6 +33,7 @@ networks:
end: 172.10.101.20
name: EXTERNAL
network_name: admin_external
+ mapping: physnet1
- cidr: '10.20.11.0/24'
gateway: '10.20.11.1'
ip_ranges:
diff --git a/deploy/config/vm_environment/zte-virtual2/network.yml b/deploy/config/vm_environment/zte-virtual2/network.yml
index 28d531ce..9477ab9c 100644
--- a/deploy/config/vm_environment/zte-virtual2/network.yml
+++ b/deploy/config/vm_environment/zte-virtual2/network.yml
@@ -33,6 +33,7 @@ networks:
end: 172.10.101.20
name: EXTERNAL
network_name: admin_external
+ mapping: physnet1
- cidr: '10.20.11.0/24'
gateway: '10.20.11.1'
ip_ranges:
diff --git a/deploy/post/execute.py b/deploy/post/execute.py
index d310acbc..37a67b4c 100644
--- a/deploy/post/execute.py
+++ b/deploy/post/execute.py
@@ -16,14 +16,14 @@ import nova
from deploy.config.network import NetworkConfig
-def _config_external_network(ext_name):
+def _config_external_network(ext_name, physnet):
body = {
'network': {
'name': ext_name,
'admin_state_up': True,
'shared': False,
'provider:network_type': 'flat',
- 'provider:physical_network': 'physnet1',
+ 'provider:physical_network': physnet,
'router:external': True
}
}
@@ -50,9 +50,10 @@ def _config_external_subnet(ext_id, network_conf):
def _create_external_network(network_file):
network_conf = NetworkConfig(network_file=network_file)
ext_name = network_conf.ext_network_name
+ physnet = network_conf.ext_mapping
neutronclient = neutron.Neutron()
ext_id = neutronclient.create_network(ext_name,
- _config_external_network(ext_name))
+ _config_external_network(ext_name, physnet))
neutronclient.create_subnet(_config_external_subnet(ext_id, network_conf))