summaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
authorZhijiang Hu <hu.zhijiang@zte.com.cn>2017-03-28 02:23:41 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-28 02:23:41 +0000
commitd17daf1af5056040e5399af814ebd850a70a4a75 (patch)
tree898a6e3b1bd430bb468389af64d5ef8d1b896840 /deploy
parent3324525378940af1f53c75a264d3945382dfe623 (diff)
parent2a710a61e3b560c2d39cb759f5d9ac1da21d34c4 (diff)
Merge "unify the way of obtaining network configuration"
Diffstat (limited to 'deploy')
-rw-r--r--deploy/config/network.py8
-rw-r--r--deploy/prepare/execute.py4
2 files changed, 2 insertions, 10 deletions
diff --git a/deploy/config/network.py b/deploy/config/network.py
index 9f03bc15..cd38e94d 100644
--- a/deploy/config/network.py
+++ b/deploy/config/network.py
@@ -64,11 +64,3 @@ class NetworkConfig(object):
prefix = self.type2name[network_type]
name = '{}_{}'.format(prefix, field) if field else prefix
setattr(self, name, value)
-
- @property
- def external_network(self):
- return self._get_network('EXTERNAL')
-
- @property
- def external_name(self):
- return self.external_network['network_name']
diff --git a/deploy/prepare/execute.py b/deploy/prepare/execute.py
index 30319b2e..1e88755c 100644
--- a/deploy/prepare/execute.py
+++ b/deploy/prepare/execute.py
@@ -40,9 +40,9 @@ def _config_service(service, subs):
@_config_service('nova', ['api'])
def _set_default_floating_pool(network_file):
- xnet = NetworkConfig(network_file=network_file).external_network
+ xnet = NetworkConfig(network_file=network_file).ext_network_name
return '[DEFAULT]\n' \
- 'default_floating_pool = {}\n'.format(xnet['network_name'])
+ 'default_floating_pool = {}\n'.format(xnet)
@_config_service('heat', ['api', 'engine'])