diff options
| author |   Manuel Buil <mbuil@suse.com> | 2018-08-24 10:02:14 +0200 |
|---|---|---|
| committer | Manuel Buil <mbuil@suse.com> | 2018-09-18 12:35:44 +0000 |
| commit | 77bdb6a79a506f91959070dc8ff28949f2dff825 (patch) | |
| tree | 1dc4b45f5b76fa2e0e3abff35112664311dd7164 /scenarios/os-odl-sfc | |
| parent | b8f56c8fcbd79d25e70e00a0acc5a9d69ebc6fac (diff) | |
Add new variables for ODL Fluorine
Change-Id: I80429ebcfd9e4a9c347b1b1865f4584b9bce1a66
Signed-off-by: Manuel Buil <mbuil@suse.com>
Diffstat (limited to 'scenarios/os-odl-sfc')
3 files changed, 27 insertions, 3 deletions
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/templates/ha/user_sfc_scenarios_variables_ubuntu.yml.j2 b/scenarios/os-odl-sfc/role/os-odl-sfc/templates/ha/user_sfc_scenarios_variables_ubuntu.yml.j2 index 9cc27279..48b3babe 100644 --- a/scenarios/os-odl-sfc/role/os-odl-sfc/templates/ha/user_sfc_scenarios_variables_ubuntu.yml.j2 +++ b/scenarios/os-odl-sfc/role/os-odl-sfc/templates/ha/user_sfc_scenarios_variables_ubuntu.yml.j2 @@ -103,17 +103,25 @@ provider_networks: - cinder_volume - nova_compute +# This repo is used for OVS 2.9.2 user_external_repos_list: - - repo: 'ppa:mardim/mardim-ppa' + - repo: 'deb http://ppa.launchpad.net/mardim/mardim-ppa/ubuntu xenial main' + +user_external_repo_keys_list: + - id: 6E2EEDF1A3925D9D727EB1176FAD8BA42AAAEB9F + keyserver: keyserver.ubuntu.com openstack_host_specific_kernel_modules: - name: openvswitch ovs_nsh_required_metal_packages: + - python-six + - python3-six - linux-headers-{{ ansible_kernel }} - openvswitch-datapath-dkms openstack_host_metal_distro_packages: "{{ ovs_nsh_required_metal_packages + _openstack_host_metal_distro_packages }}" + {% endraw %} {% if odl_repo_version is defined %} diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/templates/mini/user_sfc_scenarios_variables_ubuntu.yml.j2 b/scenarios/os-odl-sfc/role/os-odl-sfc/templates/mini/user_sfc_scenarios_variables_ubuntu.yml.j2 index bc554090..6f083611 100644 --- a/scenarios/os-odl-sfc/role/os-odl-sfc/templates/mini/user_sfc_scenarios_variables_ubuntu.yml.j2 +++ b/scenarios/os-odl-sfc/role/os-odl-sfc/templates/mini/user_sfc_scenarios_variables_ubuntu.yml.j2 @@ -102,17 +102,25 @@ provider_networks: - cinder_volume - nova_compute +# This repo is for ovs 2.9.2 user_external_repos_list: - - repo: 'ppa:mardim/mardim-ppa' + - repo: 'deb http://ppa.launchpad.net/mardim/mardim-ppa/ubuntu xenial main' + +user_external_repo_keys_list: + - id: 6E2EEDF1A3925D9D727EB1176FAD8BA42AAAEB9F + keyserver: keyserver.ubuntu.com openstack_host_specific_kernel_modules: - name: openvswitch ovs_nsh_required_metal_packages: + - python-six + - python3-six - linux-headers-{{ ansible_kernel }} - openvswitch-datapath-dkms openstack_host_metal_distro_packages: "{{ ovs_nsh_required_metal_packages + _openstack_host_metal_distro_packages }}" + {% endraw %} {% if odl_repo_version is defined %} diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/templates/noha/user_sfc_scenarios_variables_ubuntu.yml.j2 b/scenarios/os-odl-sfc/role/os-odl-sfc/templates/noha/user_sfc_scenarios_variables_ubuntu.yml.j2 index bc554090..1c8ee388 100644 --- a/scenarios/os-odl-sfc/role/os-odl-sfc/templates/noha/user_sfc_scenarios_variables_ubuntu.yml.j2 +++ b/scenarios/os-odl-sfc/role/os-odl-sfc/templates/noha/user_sfc_scenarios_variables_ubuntu.yml.j2 @@ -102,17 +102,25 @@ provider_networks: - cinder_volume - nova_compute +# This repo is used for ovs 2.9.2 user_external_repos_list: - - repo: 'ppa:mardim/mardim-ppa' + - repo: 'deb http://ppa.launchpad.net/mardim/mardim-ppa/ubuntu xenial main' + +user_external_repo_keys_list: + - id: 6E2EEDF1A3925D9D727EB1176FAD8BA42AAAEB9F + keyserver: keyserver.ubuntu.com openstack_host_specific_kernel_modules: - name: openvswitch ovs_nsh_required_metal_packages: + - python-six + - python3-six - linux-headers-{{ ansible_kernel }} - openvswitch-datapath-dkms openstack_host_metal_distro_packages: "{{ ovs_nsh_required_metal_packages + _openstack_host_metal_distro_packages }}" + {% endraw %} {% if odl_repo_version is defined %} |