From: Harry Huang <huangxiangyu5@huawei.com>
Date: Thu, 16 Aug 2018 11:24:13 +0000 (+0800)
Subject: Remove neutron-lib installation for odl
X-Git-Tag: opnfv-7.0.0~20^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F97%2F60997%2F2;p=compass4nfv.git

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>
---

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