summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQiLiang <liangqi1@huawei.com>2016-05-26 04:19:13 +0800
committerQiLiang <liangqi1@huawei.com>2016-05-26 04:23:53 +0800
commit1dd2e2706bdd149543bfedf9726116f5eda261f7 (patch)
tree2ae46a67553c2f32618b985da519a3efd812248f
parentcb89afc411d5b300d2e44dedc01826477b2fb1b7 (diff)
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>
-rw-r--r--.gitignore3
-rw-r--r--deploy/adapters/ansible/roles/neutron-controller/tasks/main.yml8
-rw-r--r--deploy/adapters/ansible/roles/neutron-network/tasks/main.yml2
3 files changed, 6 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index 33a0451b..c1695038 100644
--- 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 2c6891f3..018bea9a 100644
--- 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 9b41ac18..99b21135 100644
--- 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'