From 0ebcf5e461c5cecfb23b4497d8966485fd504c55 Mon Sep 17 00:00:00 2001 From: wutianwei Date: Wed, 16 Aug 2017 10:55:04 +0800 Subject: support the noha scenario 1. add parameter to install keepalived when only one controller 2. change the osa code to start keepalived and haproxy 3. add the noha DHA files 4. fix the setup ovs bug 5. fix the pod1 public vip Change-Id: I19f4e78b9ca834ae3d454e1c8058728ece055f69 Signed-off-by: wutianwei --- deploy/adapters/ansible/roles/config-osa/files/setup-ovs.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'deploy/adapters/ansible/roles/config-osa/files/setup-ovs.yml') diff --git a/deploy/adapters/ansible/roles/config-osa/files/setup-ovs.yml b/deploy/adapters/ansible/roles/config-osa/files/setup-ovs.yml index e906ed45..ed631036 100644 --- a/deploy/adapters/ansible/roles/config-osa/files/setup-ovs.yml +++ b/deploy/adapters/ansible/roles/config-osa/files/setup-ovs.yml @@ -30,9 +30,8 @@ - name: change the openvswitch_agent.ini lineinfile: dest: /etc/neutron/plugins/ml2/openvswitch_agent.ini + state: absent regexp: '^bridge_mappings' - insertafter: '^bridge_mappings' - line: "local_ip = {{hostvars[inventory_hostname]['ansible_br_tenant']['ipv4']['address']}}" notify: - Restart neutron-openvswitch-agent when: -- cgit 1.2.3-korg