diff options
| author |   shuai chen <chenshuai@huawei.com> | 2016-02-25 06:29:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-02-25 06:29:49 +0000 |
| commit | 9935544adcee9f2c1be9be4fc53704eb6d5d3de1 (patch) | |
| tree | 4a3897faf37a42337c835ae913aa105bf248b587 /deploy | |
| parent | 6ac57963661c5dd2d1fb523736b28d311b0d2ab7 (diff) | |
| parent | e99e3d4ba20c7a1e6c827def77f5a90490b773de (diff) | |
Merge "Use ml2 config for Neutron"
Diffstat (limited to 'deploy')
| -rw-r--r-- | deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml | 2 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml | 7 |
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 |