summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorHarry Huang <huangxiangyu5@huawei.com>2018-08-16 19:24:13 +0800
committerHarry Huang <huangxiangyu5@huawei.com>2018-08-18 05:30:01 +0000
commited9a1651df73c7958efb39e5ddc057adba793f39 (patch)
tree899490cb9b955b6ae3166f522c19efdd48943167 /plugins
parent850339f2760b19773becff054733a23f99523269 (diff)
Remove neutron-lib installation for odl
JIRA: - neutron 13.0.0.0rc1 now requires neutron-lib 1.18.0. Change-Id: I64c6872761f9dbfd6682fa6dfc096cbd133a4e04 Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
Diffstat (limited to 'plugins')
-rwxr-xr-xplugins/odl_cluster/roles/setup-odl/tasks/control-agents-1.yml6
-rwxr-xr-xplugins/odl_cluster/roles/setup-odl/tasks/control-servers-1.yml6
2 files changed, 0 insertions, 12 deletions
diff --git a/plugins/odl_cluster/roles/setup-odl/tasks/control-agents-1.yml b/plugins/odl_cluster/roles/setup-odl/tasks/control-agents-1.yml
index 91ca514c..ecc67d29 100755
--- a/plugins/odl_cluster/roles/setup-odl/tasks/control-agents-1.yml
+++ b/plugins/odl_cluster/roles/setup-odl/tasks/control-agents-1.yml
@@ -10,12 +10,6 @@
name: networking-odl
virtualenv: /openstack/venvs/neutron-{{ os_ver }}
-- name: install neutron-lib
- pip:
- name: neutron-lib
- version: 1.14.0
- virtualenv: /openstack/venvs/neutron-{{ os_ver }}
-
- name: configure vsctl for dhcp agent
shell: |
crudini --set /etc/neutron/dhcp_agent.ini OVS \
diff --git a/plugins/odl_cluster/roles/setup-odl/tasks/control-servers-1.yml b/plugins/odl_cluster/roles/setup-odl/tasks/control-servers-1.yml
index 7f80a36b..060abfc6 100755
--- a/plugins/odl_cluster/roles/setup-odl/tasks/control-servers-1.yml
+++ b/plugins/odl_cluster/roles/setup-odl/tasks/control-servers-1.yml
@@ -10,11 +10,5 @@
name: networking-odl
virtualenv: /openstack/venvs/neutron-{{ os_ver }}
-- name: install neutron-lib
- pip:
- name: neutron-lib
- version: 1.14.0
- virtualenv: /openstack/venvs/neutron-{{ os_ver }}
-
- name: turn off neutron-server on control node
service: name=neutron-server state=stopped