From 5388c0cfd7aaee3a877906fd66a519e60bf5fc87 Mon Sep 17 00:00:00 2001 From: Yifei Xue Date: Thu, 27 Jul 2017 20:34:52 +0800 Subject: Add ODL SFC support Add SFC support for Ocata and Carbon. 1. Add ovs-nsh package for sfc scenario 2. Add sfc configuration and tasks 3. Add sfc DHA files Change-Id: Icf8f20220a2c5ac38a5b92d3ca0e24cbb0e89a52 Signed-off-by: Yifei Xue --- plugins/odl_sfc/roles/sfc-pre-2/tasks/main.yml | 12 ++++++++ .../odl_sfc/roles/sfc-pre-2/tasks/setup_sfc.yml | 34 ++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 plugins/odl_sfc/roles/sfc-pre-2/tasks/main.yml create mode 100644 plugins/odl_sfc/roles/sfc-pre-2/tasks/setup_sfc.yml (limited to 'plugins/odl_sfc/roles/sfc-pre-2') diff --git a/plugins/odl_sfc/roles/sfc-pre-2/tasks/main.yml b/plugins/odl_sfc/roles/sfc-pre-2/tasks/main.yml new file mode 100644 index 00000000..c4c01987 --- /dev/null +++ b/plugins/odl_sfc/roles/sfc-pre-2/tasks/main.yml @@ -0,0 +1,12 @@ +############################################################################## +# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- + +- include: setup_sfc.yml + when: odl_sfc is defined and odl_sfc == "Enable" diff --git a/plugins/odl_sfc/roles/sfc-pre-2/tasks/setup_sfc.yml b/plugins/odl_sfc/roles/sfc-pre-2/tasks/setup_sfc.yml new file mode 100644 index 00000000..a80a81ef --- /dev/null +++ b/plugins/odl_sfc/roles/sfc-pre-2/tasks/setup_sfc.yml @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +- name: add ovs package in neutron + lineinfile: + dest: /etc/ansible/roles/os_neutron/vars/ubuntu-16.04.yml + insertbefore: 'openvswitch-common' + line: ' - openvswitch-datapath-dkms' + +- name: add ovs package in neutron + lineinfile: + dest: /etc/ansible/roles/os_neutron/vars/ubuntu-16.04.yml + insertafter: 'openvswitch-switch' + line: ' - python-openvswitch' + +- name: modify ovs installation in neutron + blockinfile: + dest: /etc/ansible/roles/os_neutron/tasks/neutron_install.yml + insertafter: '^# limitations' + block: | + - name: add ovs-nsh repo + apt_repository: + repo: "ppa:mardim/mardim-ppa" + update_cache: True + state: present + when: + - inventory_hostname in groups['neutron_openvswitch_agent'] + - inventory_hostname not in groups['nova_compute'] -- cgit 1.2.3-korg