Code Review
/
releng-xci-scenarios.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Connect ODL CI-CD to XCI
[releng-xci-scenarios.git]
/
os-odl-nofeature
/
role
/
os-odl-nofeature
/
templates
/
user_variables_os-odl-nofeature.yml.j2
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.
# ##
# ## 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"
# 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:
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 %}