diff options
author | Harry Huang <huangxiangyu5@huawei.com> | 2018-08-22 07:07:48 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-08-22 07:07:48 +0000 |
commit | 4091fbbd7193ffef379fc856d7795f8054e95cb0 (patch) | |
tree | bd23af55fb5b56dd49b7e2dfa34818f42d4ad197 /plugins/odl_cluster/roles/setup-odl | |
parent | 95051275af7e753f6901c24be2b38553daf84b0d (diff) | |
parent | ed9a1651df73c7958efb39e5ddc057adba793f39 (diff) |
Merge "Remove neutron-lib installation for odl"
Diffstat (limited to 'plugins/odl_cluster/roles/setup-odl')
-rwxr-xr-x | plugins/odl_cluster/roles/setup-odl/tasks/control-agents-1.yml | 6 | ||||
-rwxr-xr-x | plugins/odl_cluster/roles/setup-odl/tasks/control-servers-1.yml | 6 |
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 |