Config dpdk and ovs

switch dpdk interface driver and bring
up corresponding ovs bridges.

Change-Id: I07bd9b332978482507711cfbd8ad29802a8b1a8c
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>

4 files changed, 39 insertions, 27 deletions

diff --git a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
index 3f58435e..59826776 100644
--- a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
+++ b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
@@ -46,6 +46,13 @@
   roles:
     - post-osa
 
+- hosts:
+    - neutron_openvswitch_agent
+    - compute
+  remote_user: root
+  roles:
+    - config-dpdk
+
 - hosts: neutron_openvswitch_agent
   remote_user: root
   roles:
diff --git a/deploy/adapters/ansible/roles/post-osa/tasks/Ubuntu.yml b/deploy/adapters/ansible/roles/post-osa/tasks/Ubuntu.yml
new file mode 100755
index 00000000..5d53d234
--- /dev/null
+++ b/deploy/adapters/ansible/roles/post-osa/tasks/Ubuntu.yml
@@ -0,0 +1,23 @@
+---
+- name: remove bridge ubuntu
+  template:
+    src: compute.j2
+    dest: /etc/network/interfaces
+  notify:
+    - restart network service
+
+- name: fix mapping in compute
+  shell: |
+    {% set compute_mappings = [] %}
+    {% for key, value in compu_prv_mappings.iteritems() %}
+    {% set mapping = key + ":" + value["bridge"] %}
+    {% set _ = compute_mappings.append(mapping) %}
+    {% endfor %}
+    {% if compute_mappings | length != 0 %}
+    sed -i "s/^\(bridge_mappings\).*/\1 = {{ ','.join(compute_mappings) }}/g" \
+    /etc/neutron/plugins/ml2/openvswitch_agent.ini
+    {% else %}
+    sed -i "/bridge_mappings/d" /etc/neutron/plugins/ml2/openvswitch_agent.ini
+    {% endif %}
+
+- meta: flush_handlers
diff --git a/deploy/adapters/ansible/roles/post-osa/tasks/main.yml b/deploy/adapters/ansible/roles/post-osa/tasks/main.yml
index cf157d74..c48a5d1a 100644
--- a/deploy/adapters/ansible/roles/post-osa/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/post-osa/tasks/main.yml
@@ -1,12 +1,10 @@
+#############################################################################
+# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
 ---
-- name: remove bridge ubuntu
-  template:
-    src: compute.j2
-    dest: /etc/network/interfaces
-  notify:
-    - restart network service
-  when: ansible_distribution == 'Ubuntu'
-
-# TODO
-# - name: remove bridge centos
-#   when: ansible_distribution == 'CentOS'
+- include: "{{ ansible_distribution }}.yml"
diff --git a/deploy/adapters/ansible/roles/setup-openvswitch/tasks/compute.yml b/deploy/adapters/ansible/roles/setup-openvswitch/tasks/compute.yml
index 62edd34b..b7a8fbcb 100644
--- a/deploy/adapters/ansible/roles/setup-openvswitch/tasks/compute.yml
+++ b/deploy/adapters/ansible/roles/setup-openvswitch/tasks/compute.yml
@@ -22,22 +22,6 @@
   notify:
     - restart neutron-openvswitch-agent
 
-- name: fix mapping in compute
-  shell: |
-    {% set compute_mappings = [] %}
-    {% for key, value in compu_prv_mappings.iteritems() %}
-    {% set mapping = key + ":" + value["bridge"] %}
-    {% set _ = compute_mappings.append(mapping) %}
-    {% endfor %}
-    {% if compute_mappings | length != 0 %}
-    sed -i "s/^\(bridge_mappings\).*/\1 = {{ ','.join(compute_mappings) }}/g" \
-    /etc/neutron/plugins/ml2/openvswitch_agent.ini
-    {% else %}
-    sed -i "/bridge_mappings/d" /etc/neutron/plugins/ml2/openvswitch_agent.ini
-    {% endif %}
-  notify:
-    - restart neutron-openvswitch-agent
-
 - name: create compute bridges
   openvswitch_bridge:
     bridge: "{{ item['name'] }}"