From f93fc4fc70694d21f136ae1599b13fd237018b74 Mon Sep 17 00:00:00 2001
From: chigang <chigang@huawei.com>
Date: Tue, 4 Jul 2017 13:21:12 +0800
Subject: Fix keepalived ping address

JIRA:-

Replace OSA default address with  ntp_server address.
OSA will use it to check internet connection.
Rename some roles that make users confused.

Change-Id: I4dd7e242e427e5bc3a611450a3bc436e44a8fefe
Signed-off-by: chigang <chigang@huawei.com>
---
 .../ansible/roles/config-osa/files/setup-ovs.yml   | 57 ++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 deploy/adapters/ansible/roles/config-osa/files/setup-ovs.yml

(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
new file mode 100644
index 00000000..57bc5ef1
--- /dev/null
+++ b/deploy/adapters/ansible/roles/config-osa/files/setup-ovs.yml
@@ -0,0 +1,57 @@
+---
+- name: Installation and setup of Neutron
+  hosts: neutron_openvswitch_agent
+  gather_facts: "{{ gather_facts | default(True) }}"
+  max_fail_percentage: 20
+  user: root
+  tasks:
+    - name: stop neutron-openvswitch-agent
+      service:
+        name: neutron-openvswitch-agent
+        state: stopped
+
+    # yamllint disable rule:line-length
+    - name: change the openvswitch_agent.ini
+      lineinfile:
+        dest: /etc/neutron/plugins/ml2/openvswitch_agent.ini
+        insertafter: '^bridge_mappings'
+        line: "local_ip = {{ hostvars[inventory_hostname]['container_networks']['tunnel_address']['address'] }}"
+      when:
+        - inventory_hostname not in groups['nova_compute']
+
+    - name: change the openvswitch_agent.ini
+      lineinfile:
+        dest: /etc/neutron/plugins/ml2/openvswitch_agent.ini
+        regexp: '^bridge_mappings'
+        insertafter: '^bridge_mappings'
+        line: "local_ip = {{hostvars[inventory_hostname]['ansible_br_vxlan']['ipv4']['address']}}"
+      notify:
+        - Restart neutron-openvswitch-agent
+      when:
+        - inventory_hostname in groups['nova_compute']
+    # yamllint enable rule:line-length
+
+    - name: Setup br-provider
+      openvswitch_bridge:
+        bridge: br-provider
+        state: present
+      notify:
+        - Restart neutron-openvswitch-agent
+      when:
+        - inventory_hostname not in groups['nova_compute']
+
+    - name: Add port to br-provider
+      openvswitch_port:
+        bridge: br-provider
+        port: "eth12"
+        state: present
+      notify:
+        - Restart neutron-openvswitch-agent
+      when:
+        - inventory_hostname not in groups['nova_compute']
+
+  handlers:
+    - name: Restart neutron-openvswitch-agent
+      service:
+        name: neutron-openvswitch-agent
+        state: restarted
-- 
cgit 1.2.3-korg