From: Manuel Buil <mbuil@suse.com>
Date: Tue, 3 Apr 2018 09:36:02 +0000 (+0200)
Subject: Simplify odl scenarios
X-Git-Tag: 6.0.0~41^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F85%2F54785%2F11;p=releng-xci.git

Simplify odl scenarios

So far we were building the repo url variable in the odl scenarios. Moving
that logic to ODL role probably makes more sense as it can be reused by all
scenarios.

This patch passes the odl_version to OSA. That variable will be processed by
the ODL role, which will finally generate the repo url variable

deploy-scenario:os-odl-nofeature
installer-type:osa
Change-Id: I0c9da069238348af6d00d8422ca478cb4be4cfad
Signed-off-by: Manuel Buil <mbuil@suse.com>
---

diff --git a/xci/scenarios/os-odl-nofeature/role/os-odl-nofeature/templates/user_variables_os-odl-nofeature.yml.j2 b/xci/scenarios/os-odl-nofeature/role/os-odl-nofeature/templates/user_variables_os-odl-nofeature.yml.j2
index 5a5ec553..eb08adc0 100644
--- a/xci/scenarios/os-odl-nofeature/role/os-odl-nofeature/templates/user_variables_os-odl-nofeature.yml.j2
+++ b/xci/scenarios/os-odl-nofeature/role/os-odl-nofeature/templates/user_variables_os-odl-nofeature.yml.j2
@@ -40,6 +40,6 @@ neutron_plugin_base:
   - odl-router_v2
 {% endraw %}
 
-{% if ODL_VERSION is defined %}
-odl_repo_url: "{{ repo_url[ ansible_pkg_mgr ] }}"
+{% if odl_repo_version is defined %}
+odl_version: "{{ odl_repo_version }}"
 {% endif %}
diff --git a/xci/scenarios/os-odl-nofeature/role/os-odl-nofeature/vars/main.yml b/xci/scenarios/os-odl-nofeature/role/os-odl-nofeature/vars/main.yml
deleted file mode 100644
index 5f672b37..00000000
--- a/xci/scenarios/os-odl-nofeature/role/os-odl-nofeature/vars/main.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-odl_version:
-  master: 9
-  oxygen: 8
-  nitrogen: 7
-
-repo_url:
-  zypper: "{% if ODL_VERSION is defined %}https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-{{ odl_version[ODL_VERSION] }}-opensuse-devel.repo{% endif %}"
-  yum: "{% if ODL_VERSION is defined %}https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-{{ odl_version[ODL_VERSION] }}-devel.repo{% endif %}"
-  apt: "{% if ODL_VERSION is defined %}https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-{{ odl_version[ODL_VERSION] }}-ubuntu-devel.repo{% endif %}"
diff --git a/xci/scenarios/os-odl-nofeature/vars/main.yml b/xci/scenarios/os-odl-nofeature/vars/main.yml
new file mode 100644
index 00000000..629b50c7
--- /dev/null
+++ b/xci/scenarios/os-odl-nofeature/vars/main.yml
@@ -0,0 +1,2 @@
+---
+odl_repo_version: "{{ lookup('env','ODL_VERSION') }}"