summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml
diff options
context:
space:
mode:
authorshuai chen <chenshuai@huawei.com>2016-02-25 06:29:49 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-02-25 06:29:49 +0000
commit9935544adcee9f2c1be9be4fc53704eb6d5d3de1 (patch)
tree4a3897faf37a42337c835ae913aa105bf248b587 /deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml
parent6ac57963661c5dd2d1fb523736b28d311b0d2ab7 (diff)
parente99e3d4ba20c7a1e6c827def77f5a90490b773de (diff)
Merge "Use ml2 config for Neutron"
Diffstat (limited to 'deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml')
-rw-r--r--deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml7
1 files changed, 7 insertions, 0 deletions
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 a73e27a9..d07e187c 100644
--- a/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml
+++ b/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml
@@ -7,6 +7,13 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
---
+
+- 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
shell: neutron-db-manage --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini upgrade head
register: result