summaryrefslogtreecommitdiffstats
path: root/lib/python
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-11-11 19:26:47 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-11 19:26:47 +0000
commit5f2cc4e6b222d109836abd1172f481f303f46319 (patch)
tree3cf444cb9e0aead555945195d07b5f61230a90d4 /lib/python
parent0333a22450988e3950c0915aa0cebeddf0886952 (diff)
parente8b6d6debe2b056b404fc353f54b67364b58c59d (diff)
Merge "Migrate to stable/newton"
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/apex/network_environment.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/python/apex/network_environment.py b/lib/python/apex/network_environment.py
index 5cb2d0cd..ae5c602c 100644
--- a/lib/python/apex/network_environment.py
+++ b/lib/python/apex/network_environment.py
@@ -22,6 +22,7 @@ from .common.constants import (
PRE_CONFIG_DIR
)
+HEAT_NONE = 'OS::Heat::None'
PORTS = '/ports'
# Resources defined by <resource name>: <prefix>
EXTERNAL_RESOURCES = {'OS::TripleO::Network::External': None,
@@ -196,7 +197,7 @@ class NetworkEnvironment(dict):
if prefix is None:
prefix = ''
m = re.split('%s/\w+\.yaml' % prefix, self[reg][key])
- if m is not None:
+ if m is not None and len(m) > 1:
self.tht_dir = m[0]
break
if not self.tht_dir:
@@ -205,6 +206,9 @@ class NetworkEnvironment(dict):
def _config_resource_reg(self, resources, postfix):
for key, prefix in resources.items():
if prefix is None:
+ if postfix == '/noop.yaml':
+ self[reg][key] = HEAT_NONE
+ continue
prefix = ''
self[reg][key] = self.tht_dir + prefix + postfix