diff options
| author |   Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com> | 2018-04-13 12:07:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-04-13 12:07:01 +0000 |
| commit | 85ea368d336ec5e5f642051cf745f60bbeeff6eb (patch) | |
| tree | 6958f403a9df5c7bea31ee8944531deabd370d54 | |
| parent | ad4a9ded4736a898f09f69c8cfb8cc7c00274494 (diff) | |
| parent | 12b11d894410477a2b5d7db4647bfb73bdd21125 (diff) | |
Merge "Simplify odl scenarios"
3 files changed, 4 insertions, 12 deletions
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') }}" |