diff options
| author |   chenshuai@huawei.com <chenshuai@huawei.com> | 2016-02-27 02:08:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-02-27 02:08:33 +0000 |
| commit | 94320b6ae2a0649275d52a17db866383fb6ac5fe (patch) | |
| tree | 543f047e5591ac5fccd8fe939107659f29e3279f /deploy/adapters/ansible/roles/open-contrail/tasks/main.yml | |
| parent | 8dd2ec4c6893d7bf585ce78105379479ae065ba3 (diff) | |
| parent | c846444991b2b691a0b01057ac2ecdd1dbbcca60 (diff) | |
Merge "bugfix:remove openvswitch when enable opencontrail"
Diffstat (limited to 'deploy/adapters/ansible/roles/open-contrail/tasks/main.yml')
| -rwxr-xr-x | deploy/adapters/ansible/roles/open-contrail/tasks/main.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/main.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/main.yml index 968148f8..6c01f0f1 100755 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/main.yml +++ b/deploy/adapters/ansible/roles/open-contrail/tasks/main.yml @@ -113,6 +113,10 @@ include: provision/provision-compute.yml when: groups['opencontrail']|length !=0 and inventory_hostname not in groups['opencontrail'] +- name: Remove openvswitch on compute + include: uninstall-openvswitch.yml + when: groups['opencontrail']|length !=0 and inventory_hostname not in groups['opencontrail'] + - name: Enable Service Daemon shell: if [ -f “\/opt\/service.bak” ] ; then mv /opt/service.bak /opt/service ; fi when: groups['opencontrail']|length !=0 |