From a7e8ac7aa6cf5bdefb80fdd051a2162b4f7d6108 Mon Sep 17 00:00:00 2001
From: zhongjun <zhong.jun@zte.com.cn>
Date: Thu, 27 Apr 2017 22:15:40 +0800
Subject: Hardcoded physnet1 changed to obtain from .yml
the physical network device of external network is hardcode to
'physnet1',change it to obtain from network.yml configuration
file.
Change-Id: Id2e45ac488619db2247e73cc3fed5706db31d9e9
Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
---
deploy/post/execute.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
(limited to 'deploy/post')
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))
--
cgit