summaryrefslogtreecommitdiffstats
path: root/lib/python/apex
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-06-09 17:24:28 -0400
committerDan Radez <dradez@redhat.com>2016-06-10 00:05:43 +0000
commit88e800cde8e61acb05b60bff5997cb843ec6e133 (patch)
tree64fd40fae799dd7ba2473dd5de41c867054002ad /lib/python/apex
parentb9947ec813fea9c71b7c3208df36d110eca90b55 (diff)
Parameterizes ODL version to deploy options
Changes include: - Minor syntax fix to dataplane check - Adds 'odl_version' to deploy options - Builds ODL overcloud image with boron rpm included - If user specifies 'boron' as odl_version then, package is upgraded on overcloud image Change-Id: I37436cb8cc4d6cff1fede6c13836f26a4cc57f49 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'lib/python/apex')
-rw-r--r--lib/python/apex/deploy_env.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/python/apex/deploy_env.py b/lib/python/apex/deploy_env.py
index 25e2d0a7..fb03cd07 100644
--- a/lib/python/apex/deploy_env.py
+++ b/lib/python/apex/deploy_env.py
@@ -12,6 +12,7 @@ import yaml
import logging
REQ_DEPLOY_SETTINGS = ['sdn_controller',
+ 'odl_version',
'sdn_l3',
'tacker',
'congress',
@@ -67,7 +68,6 @@ class DeploySettings:
"specified. Valid dataplanes:"
" {}".format(value,planes))
-
for req_set in REQ_DEPLOY_SETTINGS:
if req_set not in deploy_options:
if req_set == 'dataplane':