aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/adapters
diff options
context:
space:
mode:
authorgrakiss <grakiss.wanglei@huawei.com>2016-02-24 20:16:06 -0500
committergrakiss <grakiss.wanglei@huawei.com>2016-02-24 20:16:06 -0500
commite99e3d4ba20c7a1e6c827def77f5a90490b773de (patch)
treeadf540d050ef863af0e9da24cf0c464ecebfa3d3 /deploy/adapters
parentbb0ee921be7b53609e3b942ad7aeee8b06f458d5 (diff)
Use ml2 config for Neutron
JIRA:COMPASS-321 - use ml2 config for neutron - path name and filename changed in liberty Change-Id: Ifc3d841773122dd0d2f5777747a2ba01812ec5d7 Signed-off-by: grakiss <grakiss.wanglei@huawei.com>
Diffstat (limited to 'deploy/adapters')
-rw-r--r--deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml2
-rw-r--r--deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml7
2 files changed, 8 insertions, 1 deletions
diff --git a/deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml b/deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml
index 93d9b078..9020ccae 100644
--- a/deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml
@@ -27,7 +27,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'
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