From 12b11d894410477a2b5d7db4647bfb73bdd21125 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Tue, 3 Apr 2018 11:36:02 +0200 Subject: [PATCH] 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 --- .../templates/user_variables_os-odl-nofeature.yml.j2 | 4 ++-- os-odl-nofeature/role/os-odl-nofeature/vars/main.yml | 10 ---------- os-odl-nofeature/vars/main.yml | 2 ++ 3 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 os-odl-nofeature/role/os-odl-nofeature/vars/main.yml create mode 100644 os-odl-nofeature/vars/main.yml 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') }}" -- 2.16.6