diff options
| author |   liyuenan <liyuenan@huawei.com> | 2016-12-19 11:06:36 +0800 |
|---|---|---|
| committer | liyuenan <liyuenan@huawei.com> | 2016-12-20 15:05:03 +0800 |
| commit | 819912d0379f6cd2b2693c2968576f7514a117c5 (patch) | |
| tree | e24d274484fa1ec8976c9f1bd44f5ee6e445724b /deploy/adapters/ansible/roles/neutron-network | |
| parent | eb5dbdac42b1b7b775fbc1dc513376425a6898ff (diff) | |
master only support newton
JIRA: COMPASS-513
Remove other roles and ppa, master only support newton.
Change-Id: I47ddb16baa25902c3e05cc7f9d0d6430f5dc7e00
Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/neutron-network')
| -rw-r--r-- | deploy/adapters/ansible/roles/neutron-network/tasks/main.yml | 6 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/neutron-network/vars/Debian.yml | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/deploy/adapters/ansible/roles/neutron-network/tasks/main.yml b/deploy/adapters/ansible/roles/neutron-network/tasks/main.yml index 99b21135..31f7f17c 100644 --- a/deploy/adapters/ansible/roles/neutron-network/tasks/main.yml +++ b/deploy/adapters/ansible/roles/neutron-network/tasks/main.yml @@ -58,6 +58,12 @@ systemctl daemon-reload when: ansible_os_family == 'RedHat' +- name: fix openstack neutron plugin config file ubuntu + shell: | + sed -i 's,plugins/ml2/openvswitch_agent.ini,plugin.ini,g' /etc/init/neutron-openvswitch-agent.conf + sed -i 's,plugins/ml2/openvswitch_agent.ini,plugin.ini,g' /etc/init.d/neutron-openvswitch-agent + when: ansible_os_family == "Debian" + - name: config l3 agent template: src=l3_agent.ini dest=/etc/neutron/l3_agent.ini backup=yes diff --git a/deploy/adapters/ansible/roles/neutron-network/vars/Debian.yml b/deploy/adapters/ansible/roles/neutron-network/vars/Debian.yml index 86d1af67..1a78ca8c 100644 --- a/deploy/adapters/ansible/roles/neutron-network/vars/Debian.yml +++ b/deploy/adapters/ansible/roles/neutron-network/vars/Debian.yml @@ -9,7 +9,7 @@ --- packages: - neutron-plugin-ml2 - - openvswitch-datapath-dkms + - openvswitch-switch-dpdk - openvswitch-switch - neutron-l3-agent - neutron-dhcp-agent @@ -17,7 +17,7 @@ packages: services: - openvswitch-switch - - neutron-plugin-openvswitch-agent + - neutron-openvswitch-agent openvswitch_agent: neutron-plugin-openvswitch-agent |