4 files changed, 28 insertions, 12 deletions
diff --git a/xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/tasks/main.yml b/xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/tasks/main.yml
index 3725fb58..79aa3aa1 100644
--- a/xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/tasks/main.yml
+++ b/xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/tasks/main.yml
@@ -11,8 +11,8 @@
 - name: copy user_variables_os-nosdn-nofeature.yml
   copy:
     src: "user_variables_os-nosdn-nofeature.yml"
-    dest: "{{OPENSTACK_OSA_ETC_PATH}}/user_variables_os-nosdn-nofeature.yml"
+    dest: "{{openstack_osa_etc_path}}/user_variables_os-nosdn-nofeature.yml"
 - name: copy os-nosdn-nofeature scenario specific openstack_user_config.yml
   copy:
-    src: "{{XCI_FLAVOR}}/openstack_user_config.yml"
-    dest: "{{OPENSTACK_OSA_ETC_PATH}}/openstack_user_config.yml"
+    src: "{{xci_flavor}}/openstack_user_config.yml"
+    dest: "{{openstack_osa_etc_path}}/openstack_user_config.yml"
diff --git a/xci/scenarios/os-odl-nofeature/role/os-odl-nofeature/tasks/main.yml b/xci/scenarios/os-odl-nofeature/role/os-odl-nofeature/tasks/main.yml
index 61d31a7f..7e872787 100644
--- a/xci/scenarios/os-odl-nofeature/role/os-odl-nofeature/tasks/main.yml
+++ b/xci/scenarios/os-odl-nofeature/role/os-odl-nofeature/tasks/main.yml
@@ -9,18 +9,18 @@
 ##############################################################################
 
 - name: copy user_variables_os-odl-nofeature.yml
-  copy:
-    src: "user_variables_os-odl-nofeature.yml"
-    dest: "{{OPENSTACK_OSA_ETC_PATH}}/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
   copy:
-    src: "{{XCI_FLAVOR}}/user_variables_os-odl-nofeature-ha.yml"
-    dest: "{{OPENSTACK_OSA_ETC_PATH}}/user_variables_os-odl-nofeature-ha.yml"
+    src: "{{xci_flavor}}/user_variables_os-odl-nofeature-ha.yml"
+    dest: "{{openstack_osa_etc_path}}/user_variables_os-odl-nofeature-ha.yml"
   when:
-  - XCI_FLAVOR == "ha"
+  - xci_flavor == "ha"
 
 - name: copy os-odl-nofeature scenario specific openstack_user_config.yml
   copy:
-    src: "{{XCI_FLAVOR}}/openstack_user_config.yml"
-    dest: "{{OPENSTACK_OSA_ETC_PATH}}/openstack_user_config.yml"
-\ No newline at end of file
+    src: "{{xci_flavor}}/openstack_user_config.yml"
+    dest: "{{openstack_osa_etc_path}}/openstack_user_config.yml"
diff --git a/xci/scenarios/os-odl-nofeature/role/os-odl-nofeature/files/user_variables_os-odl-nofeature.yml b/xci/scenarios/os-odl-nofeature/role/os-odl-nofeature/templates/user_variables_os-odl-nofeature.yml.j2
index 403d372c..5a5ec553 100644
--- a/xci/scenarios/os-odl-nofeature/role/os-odl-nofeature/files/user_variables_os-odl-nofeature.yml
+++ b/xci/scenarios/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/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
new file mode 100644
index 00000000..5f672b37
--- /dev/null
+++ b/xci/scenarios/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 %}"