aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarry Huang <huangxiangyu5@huawei.com>2018-07-18 06:09:16 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-07-18 06:09:16 +0000
commit0f0f1b1b03cfa1d2e5e57d7e73f5be2901724ca4 (patch)
tree7ef5082a5976ad277ac76f743abf7aa8e8870a9d
parent7811e71b5c7eb4884be9d66b6c0d4cf30def87fb (diff)
parentded84bc72f9808bd892e2db4e9295bbe72e69de3 (diff)
Merge "Pin neutron-lib version to 1.14.0 for odl"
-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