From: Harry Huang <huangxiangyu5@huawei.com>
Date: Mon, 16 Jul 2018 10:41:02 +0000 (+0800)
Subject: Pin neutron-lib version to 1.14.0 for odl
X-Git-Tag: opnfv-7.0.0~39^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F53%2F59853%2F1;p=compass4nfv.git

Pin neutron-lib version to 1.14.0 for odl

JIRA: COMPASS-604

The installation of networking-odl will bring in
neutron-lib 1.17.0 which will cause db update
failure for odl scenario

Change-Id: I43fd231177268d092662c07d5adcd839a53d8b78
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 13b4c571..bc2f53d7 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,6 +10,12 @@
     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 060abfc6..7f80a36b 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,5 +10,11 @@
     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