diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-03-22 19:29:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-22 19:29:52 +0000 |
| commit | c59fa3d1cb369d9cdff5c6ef3efa383af0086d9d (patch) | |
| tree | 39bad3a9b803aa68219d4a28826471bcde3faa01 | |
| parent | 6d6aaedfc699d5fd480b2c0b2af428dc0b5d6b46 (diff) | |
| parent | 29f99f0a04df280d646de049e6c2686b923c7028 (diff) | |
Merge "Connect ODL CI-CD to XCI"
| -rw-r--r-- | xci/scenarios/os-odl-nofeature/role/os-odl-nofeature/tasks/main.yml | 4 | ||||
| -rw-r--r-- | xci/scenarios/os-odl-nofeature/role/os-odl-nofeature/templates/user_variables_os-odl-nofeature.yml.j2 (renamed from xci/scenarios/os-odl-nofeature/role/os-odl-nofeature/files/user_variables_os-odl-nofeature.yml) | 8 | ||||
| -rw-r--r-- | xci/scenarios/os-odl-nofeature/role/os-odl-nofeature/vars/main.yml | 10 |
3 files changed, 19 insertions, 3 deletions
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 cd016f5f..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,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/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 %}" |