Connect ODL CI-CD to XCI

Provide the possibility to select what version of ODL to use, master included.
Before executing xci-deploy.sh, the user can specify ODL's version by using the
XCI_ANSIBLE_PARAMS variable:

export XCI_ANSIBLE_PARAMS="-e ODL_VERSION=oxygen"

Change-Id: I5b3879b0c197059b3aecace48760e983c65a586b
Signed-off-by: Manuel Buil <mbuil@suse.com>

diff --git a/os-odl-nofeature/role/os-odl-nofeature/tasks/main.yml b/os-odl-nofeature/role/os-odl-nofeature/tasks/main.yml
index cd016f5..7e87278 100644 (file)
--- a/os-odl-nofeature/role/os-odl-nofeature/tasks/main.yml
+++ b/os-odl-nofeature/role/os-odl-nofeature/tasks/main.yml
@@ -9,8 +9,8 @@
 ##############################################################################
 
 - name: copy user_variables_os-odl-nofeature.yml
-  copy:
-    src: "user_variables_os-odl-nofeature.yml"
+  template:
+    src: "user_variables_os-odl-nofeature.yml.j2"
     dest: "{{openstack_osa_etc_path}}/user_variables_os-odl-nofeature.yml"
 
 - name: copy user_variables_os-odl-nofeature-ha.yml

diff --git a/os-odl-nofeature/role/os-odl-nofeature/files/user_variables_os-odl-nofeature.yml b/os-odl-nofeature/role/os-odl-nofeature/templates/user_variables_os-odl-nofeature.yml.j2
similarity index 90%
rename from os-odl-nofeature/role/os-odl-nofeature/files/user_variables_os-odl-nofeature.yml
rename to os-odl-nofeature/role/os-odl-nofeature/templates/user_variables_os-odl-nofeature.yml.j2
index 403d372..5a5ec55 100644 (file)
--- a/os-odl-nofeature/role/os-odl-nofeature/files/user_variables_os-odl-nofeature.yml
+++ b/os-odl-nofeature/role/os-odl-nofeature/templates/user_variables_os-odl-nofeature.yml.j2
@@ -18,6 +18,7 @@
 # ## the defaults for each role to find additional override options.
 # ##
 
+{% raw %}
 # Ensure the openvswitch kernel module is loaded
 openstack_host_specific_kernel_modules:
   - name: "openvswitch"
@@ -36,4 +37,9 @@ neutron_opendaylight_conf_ini_overrides:
 neutron_ml2_drivers_type: "flat,vlan,vxlan"
 
 neutron_plugin_base:
-  - odl-router_v2
\ No newline at end of file
+  - odl-router_v2
+{% endraw %}
+
+{% if ODL_VERSION is defined %}
+odl_repo_url: "{{ repo_url[ ansible_pkg_mgr ] }}"
+{% 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
new file mode 100644 (file)
index 0000000..5f672b3
--- /dev/null
+++ b/os-odl-nofeature/role/os-odl-nofeature/vars/main.yml
@@ -0,0 +1,10 @@
+---
+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 %}"