From b3c610b205f88dddb02cdac39638c52eafaaf82c Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Tue, 12 Sep 2017 17:32:56 -0400 Subject: Adds ability to deploy from upstream openstack To deploy with upstream openstack branch, use new deploy setting 'os_version'. A default scenario file for nosdn with pike has been included in this patch. If 'os_version' is a version other than the default version for this OPNFV release, then upstream is used. In order to use upstream with the current OS version use '--upstream' argument to the deploy command, to force an upstream deployment. Also include '-e upstream-environment.yaml' to use default upstream deployment settings. Supports nosdn and odl-nofeature deployments. Change-Id: Ic07e308827b449637b4e86cdd086434e4de2fb69 Signed-off-by: Tim Rozet --- setup.cfg | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.cfg') diff --git a/setup.cfg b/setup.cfg index 87cb6b9b..52ad12fd 100644 --- a/setup.cfg +++ b/setup.cfg @@ -33,6 +33,7 @@ data_files = share/opnfv-apex/ = build/network-environment.yaml build/opnfv-environment.yaml + build/upstream-environment.yaml build/nics-template.yaml.jinja2 build/csit-environment.yaml build/virtual-environment.yaml -- cgit 1.2.3-korg