From 88e800cde8e61acb05b60bff5997cb843ec6e133 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Thu, 9 Jun 2016 17:24:28 -0400 Subject: 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 --- lib/python/apex/deploy_env.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') 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': -- cgit 1.2.3-korg