diff options
| author |   chenshuai@huawei.com <chenshuai@huawei.com> | 2016-01-30 17:58:51 +0800 |
|---|---|---|
| committer | shuai chen <chenshuai@huawei.com> | 2016-01-30 15:44:12 +0000 |
| commit | 33f158ba8b717531b4f7122f713a6c0eeb4db003 (patch) | |
| tree | 8e8af52864e79d1b851d09105107617a24497a00 /deploy/adapters | |
| parent | 80c171e0c94e80b91e2b2405afddee6940d05d0b (diff) | |
bugfix: odl scenarios disable secgroup
JIRA: COMPASS-296
Change-Id: Ieb5e1181efad98ca76b64392ee4a24ff8a864758
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
(cherry picked from commit 5c31226684c85448f69ece611ffefbf9a3bacf23)
Diffstat (limited to 'deploy/adapters')
| -rw-r--r-- | deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml | 11 | ||||
| -rwxr-xr-x | deploy/adapters/ansible/roles/odl_cluster/tasks/openvswitch.yml | 18 |
2 files changed, 14 insertions, 15 deletions
diff --git a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml index cf49bd39..5c61c310 100644 --- a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml +++ b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml @@ -90,6 +90,12 @@ remote_user: root accelerate: true roles: + - secgroup + +- hosts: all + remote_user: root + accelerate: true + roles: - odl_cluster - hosts: all @@ -147,11 +153,6 @@ roles: - monitor -- hosts: all - remote_user: root - accelerate: true - roles: - - secgroup - hosts: all remote_user: root diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/openvswitch.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/openvswitch.yml index 840f9c12..5e3af067 100755 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/openvswitch.yml +++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/openvswitch.yml @@ -33,9 +33,8 @@ #- name: Restart OpenVSwitch # shell: service openvswitch-switch restart; -#- name: remove Neutron's openvswitch agent services -# shell: > -# update-rc.d neutron-plugin-openvswitch-agent remove +- name: remove Neutron's openvswitch agent services + shell: update-rc.d -f neutron-plugin-openvswitch-agent remove - name: Check External network shell: ovs-vsctl list-br | grep br-prv @@ -51,11 +50,17 @@ #- name: Set OpenDaylight as the manager # command: su -s /bin/sh -c "ovs-vsctl set-manager tcp:{{ internal_vip.ip }}:6640;" +- name: set opendaylight as the manager + command: su -s /bin/sh -c "ovs-vsctl set-manager tcp:{{ internal_vip.ip }}:6640;" + +- name: check br-int + shell: ovs-vsctl list-br | grep br-int; while [ $? -ne 0 ]; do sleep 10; ovs-vsctl list-br | grep br-int; done - name: set local ip in openvswitch shell: ovs-vsctl set Open_vSwitch $(ovs-vsctl show | head -n 1) other_config={'local_ip'=' {{ internal_ip }} '}; #' + ################################################################## ################ Recover External network ####################### ################################################################## @@ -88,13 +93,6 @@ ################################################################## ################################################################## ################################################################## - -- name: set opendaylight as the manager - command: su -s /bin/sh -c "ovs-vsctl set-manager tcp:{{ internal_vip.ip }}:6640;" - -- name: check br-int - shell: ovs-vsctl list-br | grep br-int; while [ $? -ne 0 ]; do sleep 10; ovs-vsctl list-br | grep br-int; done - - name: configure opendaylight -> ml2 shell: > crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 mechanism_drivers opendaylight; |