diff options
Diffstat (limited to 'deploy')
| -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 | ||||
| -rw-r--r-- | deploy/conf/base.conf | 7 |
3 files changed, 20 insertions, 16 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; diff --git a/deploy/conf/base.conf b/deploy/conf/base.conf index d7d2f4ef..f8de70ee 100644 --- a/deploy/conf/base.conf +++ b/deploy/conf/base.conf @@ -18,7 +18,12 @@ export SUBNETS="10.1.0.0/24,172.16.2.0/24,172.16.3.0/24,172.16.4.0/24" export MANAGEMENT_IP_START=${MANAGEMENT_IP_START:-'10.1.0.50'} export MANAGEMENT_INTERFACE=${MANAGEMENT_INTERFACE:-eth0} export DASHBOARD_URL="" -export ENABLE_SECGROUP="true" + +if [[ `echo $HOST_ROLES | grep odl` ]]; then + export ENABLE_SECGROUP="false" +fi + +export ENABLE_SECGROUP=${ENABLE_SECGROUP:-"true"} export ENABLE_VPNAAS="false" export ENABLE_FWAAS="false" |