FIX: Temporary workaround for ext-network create failure

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

diff --git a/deploy/adapters/ansible/roles/ext-network/tasks/main.yml b/deploy/adapters/ansible/roles/ext-network/tasks/main.yml
index 809a8fa..73fe061 100644 (file)
--- a/deploy/adapters/ansible/roles/ext-network/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/ext-network/tasks/main.yml
@@ -7,6 +7,9 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 ---
+- name: restart neutron server
+  service: name=neutron-server state=restarted enabled=yes
+
 - name: create external net
   neutron_network:
     login_username: ADMIN

diff --git a/deploy/adapters/ansible/roles/neutron-controller/tasks/main.yml b/deploy/adapters/ansible/roles/neutron-controller/tasks/main.yml
index 1aaf91a..2c6891f 100644 (file)
--- a/deploy/adapters/ansible/roles/neutron-controller/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/neutron-controller/tasks/main.yml
@@ -20,4 +20,16 @@
     - 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
+
+- name: restart other neutron-server
+  service: name=neutron-server state=restarted enabled=yes
+
 - meta: flush_handlers

diff --git a/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml b/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml
index d07e187..fd133f3 100644 (file)
--- a/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml
+++ b/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml
@@ -8,13 +8,7 @@
 ##############################################################################
 ---
 
-- 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: neutron-db-manage upgrade to Juno
+- name: neutron-db-manage upgrade
   shell: neutron-db-manage --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini upgrade head
   register: result
   run_once: True
@@ -23,11 +17,3 @@
   delay: 3
   notify:
     - restart neutron control services
-
-- name: restart first neutron-server
-  service: name=neutron-server state=restarted enabled=yes
-
-- name: restart other neutron-server
-  service: name=neutron-server state=restarted enabled=yes
-
-- meta: flush_handlers