summaryrefslogtreecommitdiffstats
path: root/lib/python/apex/network_environment.py
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-10-10 17:11:20 -0400
committerTim Rozet <trozet@redhat.com>2016-11-11 10:43:32 -0500
commite8b6d6debe2b056b404fc353f54b67364b58c59d (patch)
tree759d2a9c2794c6cbc223c251e30520c3d573a4c5 /lib/python/apex/network_environment.py
parent4e2424a3802fc541a9b21ad53981b4725ed70320 (diff)
Migrate to stable/newton
os-odl_l2_nofeature is now deprecated since new netvirt only supports odl_l3. JIRA: APEX-299 Change-Id: I3557ecb85fa4cd11bba96aa9410e56a8e8cceb00 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'lib/python/apex/network_environment.py')
-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 5cb2d0c..ae5c602 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