summaryrefslogtreecommitdiffstats
path: root/plugins/odl_sfc/roles/sfc-pre-2/tasks
diff options
context:
space:
mode:
authorYifei Xue <xueyifei@huawei.com>2018-02-06 11:46:09 +0800
committerYifei Xue <xueyifei@huawei.com>2018-02-13 04:42:15 +0000
commitcd30202e48ceedb3119d9d17b721840c54d0eb42 (patch)
treeba156f77f0869c50b28c3d5be78f8262bc00eda8 /plugins/odl_sfc/roles/sfc-pre-2/tasks
parent5dd3af7fd00971a96d91397f9754e6455abb660d (diff)
Update the odl_sfc plugin to use the latest version
JIRA: - We have upgraded odl version to nitrogen SR1. So this patch we are going to update the odl_sfc plugin to satisfy the latest odl version. Change-Id: I7342fad58c0ae21f918e27e9d72deae214c2af4e Signed-off-by: Yifei Xue <xueyifei@huawei.com>
Diffstat (limited to 'plugins/odl_sfc/roles/sfc-pre-2/tasks')
-rw-r--r--plugins/odl_sfc/roles/sfc-pre-2/tasks/setup_sfc.yml32
1 files changed, 9 insertions, 23 deletions
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
index a80a81ef..039d5460 100644
--- a/plugins/odl_sfc/roles/sfc-pre-2/tasks/setup_sfc.yml
+++ b/plugins/odl_sfc/roles/sfc-pre-2/tasks/setup_sfc.yml
@@ -7,28 +7,14 @@
# 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: copy patch file
+ copy:
+ src: odl_sfc.patch
+ dest: /opt/odl_sfc.patch
-- 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']
+- name: apply odl_sfc patch to os_neutron
+ shell: |
+ cd /etc/ansible/roles/os_neutron;
+ patch -p1 < /opt/odl_sfc.patch;
+ cd -