diff options
author | wutianwei <wutianwei1@huawei.com> | 2017-08-16 10:55:04 +0800 |
---|---|---|
committer | wutianwei <wutianwei1@huawei.com> | 2017-08-18 11:30:37 +0800 |
commit | 0ebcf5e461c5cecfb23b4497d8966485fd504c55 (patch) | |
tree | d2a5af44161f39c0557482c18518f3366d1187bf /deploy/adapters/ansible/roles/config-osa/files/setup-ovs.yml | |
parent | 5f2c78057f1a15ca90c5c25025f713a56a48dfc6 (diff) |
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 <wutianwei1@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/config-osa/files/setup-ovs.yml')
-rw-r--r-- | deploy/adapters/ansible/roles/config-osa/files/setup-ovs.yml | 3 |
1 files changed, 1 insertions, 2 deletions
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: |