From: Markos Chandras <mchandras@suse.de>
Date: Fri, 13 Apr 2018 12:41:37 +0000 (+0000)
Subject: Merge "Integrate the k8-flannel-nofeature scenario"
X-Git-Tag: 6.0.0~3
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ab3c5eacdceb71c1f1a278796a666ee1ebdc0f10;hp=872eb92baced04a27c5ffd0911637f9b3f963104;p=releng-xci-scenarios.git

Merge "Integrate the k8-flannel-nofeature scenario"
---

diff --git a/os-odl-nofeature/role/os-odl-nofeature/templates/user_variables_os-odl-nofeature.yml.j2 b/os-odl-nofeature/role/os-odl-nofeature/templates/user_variables_os-odl-nofeature.yml.j2
index 5a5ec55..eb08adc 100644
--- a/os-odl-nofeature/role/os-odl-nofeature/templates/user_variables_os-odl-nofeature.yml.j2
+++ b/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/os-odl-nofeature/role/os-odl-nofeature/vars/main.yml b/os-odl-nofeature/role/os-odl-nofeature/vars/main.yml
deleted file mode 100644
index 5f672b3..0000000
--- a/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/os-odl-nofeature/vars/main.yml b/os-odl-nofeature/vars/main.yml
new file mode 100644
index 0000000..629b50c
--- /dev/null
+++ b/os-odl-nofeature/vars/main.yml
@@ -0,0 +1,2 @@
+---
+odl_repo_version: "{{ lookup('env','ODL_VERSION') }}"