FIX: neutron deploy failure on centos

* neutron-server restart failure
* neutron-openvswitch-agent configure error on controle node
* update .gitignore

JIRA: -

Change-Id: I33f35548681cb88c74bcc80e7030645608e24b3c
Signed-off-by: QiLiang <liangqi1@huawei.com>

diff --git a/.gitignore b/.gitignore
index 33a0451..c169503 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,6 @@
 /docs_build/
 /docs_output/
 /releng/
+/work
+*.pyc
+__main__.log

diff --git a/deploy/adapters/ansible/roles/neutron-controller/tasks/main.yml b/deploy/adapters/ansible/roles/neutron-controller/tasks/main.yml
index 2c6891f..018bea9 100644 (file)
--- a/deploy/adapters/ansible/roles/neutron-controller/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/neutron-controller/tasks/main.yml
@@ -20,16 +20,12 @@
     - neutron_config
     - neutron
 
-- name: fix openstack neutron plugin config file
-  shell: |
-    sed -i 's,plugins/ml2/openvswitch_agent.ini,plugin.ini,g' /usr/lib/systemd/system/neutron-openvswitch-agent.service
-    systemctl daemon-reload
-  when: ansible_os_family == 'RedHat'
-
 - name: restart first neutron-server
   service: name=neutron-server state=restarted enabled=yes
+  when: inventory_hostname == groups['controller'][0]
 
 - name: restart other neutron-server
   service: name=neutron-server state=restarted enabled=yes
+  when: inventory_hostname != groups['controller'][0]
 
 - meta: flush_handlers

diff --git a/deploy/adapters/ansible/roles/neutron-network/tasks/main.yml b/deploy/adapters/ansible/roles/neutron-network/tasks/main.yml
index 9b41ac1..99b2113 100644 (file)
--- a/deploy/adapters/ansible/roles/neutron-network/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/neutron-network/tasks/main.yml
@@ -54,7 +54,7 @@
 
 - name: fix openstack neutron plugin config file
   shell: |
-    sed -i 's,plugins/openvswitch/ovs_neutron_plugin.ini,plugin.ini,g' /usr/lib/systemd/system/neutron-openvswitch-agent.service
+    sed -i 's,plugins/ml2/openvswitch_agent.ini,plugin.ini,g' /usr/lib/systemd/system/neutron-openvswitch-agent.service
     systemctl daemon-reload
   when: ansible_os_family == 'RedHat'