diff options
| author |   Harry Huang <huangxiangyu5@huawei.com> | 2018-07-20 17:12:25 +0800 |
|---|---|---|
| committer | Harry Huang <huangxiangyu5@huawei.com> | 2018-07-23 02:22:14 +0000 |
| commit | 27b030fb5cf3f779a5d3af2d9081dc22950f5233 (patch) | |
| tree | a9bdf26145f0ce0a4cd035675292c2b639621cf4 /deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml | |
| parent | 2f55e496b03038296b59d4fb2c0dbf1af3223226 (diff) | |
Modify openvswitch installation
JIRA: COMPASS-604
1. Keep linux bridges when ODL scenario
2. degrade ovs to 2.8.0 for 2.9.0 has issue with ODL
Change-Id: I4433fb1bb4e2d64c7220296ca167f32e4a4246be
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml')
| -rw-r--r-- | deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml b/deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml index 87e508ca..2deecb3b 100644 --- a/deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml +++ b/deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml @@ -10,9 +10,17 @@ - include: controller.yml when: - inventory_hostname not in groups['nova_compute'] - - NEUTRON_MECHANISM_DRIVERS[0] == "openvswitch" or "opendaylight" + - NEUTRON_MECHANISM_DRIVERS[0] == "openvswitch" - include: compute.yml when: - inventory_hostname in groups['nova_compute'] - - NEUTRON_MECHANISM_DRIVERS[0] == "openvswitch" or "opendaylight" + - NEUTRON_MECHANISM_DRIVERS[0] == "openvswitch" + +- include_vars: "{{ ansible_os_family }}.yml" + when: + - NEUTRON_MECHANISM_DRIVERS[0] == "opendaylight" + +- include: odl.yml + when: + - NEUTRON_MECHANISM_DRIVERS[0] == "opendaylight" |