aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarry Huang <huangxiangyu5@huawei.com>2018-07-16 18:41:02 +0800
committerHarry Huang <huangxiangyu5@huawei.com>2018-07-16 18:41:02 +0800
commitded84bc72f9808bd892e2db4e9295bbe72e69de3 (patch)
treed1b148ba41a504d03030f9a507057b0fb016665f
parent568068caa189a8643cdd53de774259ab76297d43 (diff)
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>
-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, 12 insertions, 0 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 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