summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshuai chen <chenshuai@huawei.com>2016-05-24 09:03:38 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-05-24 09:03:38 +0000
commit3fb8f37c0e1cbf1a5de75282d8889f365105fb61 (patch)
treea9492a195112f882ff8a1d08263d3a7d78f4331e
parent9de7d7031a227a04e965ca1448fddf42fe7d545c (diff)
parent750feebcb5a6824ee9a4aed0aec1180172aa37f3 (diff)
Merge "FIX: Temporary workaround for ext-network create failure"
-rw-r--r--deploy/adapters/ansible/roles/ext-network/tasks/main.yml3
-rw-r--r--deploy/adapters/ansible/roles/neutron-controller/tasks/main.yml12
-rw-r--r--deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml16
3 files changed, 16 insertions, 15 deletions
diff --git a/deploy/adapters/ansible/roles/ext-network/tasks/main.yml b/deploy/adapters/ansible/roles/ext-network/tasks/main.yml
index 809a8fa0..73fe061b 100644
--- 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 1aaf91a3..2c6891f3 100644
--- 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 d07e187c..fd133f37 100644
--- 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