diff options
| author |   Justin chi <chigang@huawei.com> | 2017-02-27 06:11:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-02-27 06:11:28 +0000 |
| commit | 3485de734f87dbd4d99194dedf1b40e7476539f1 (patch) | |
| tree | 88f9daa0e7ddc7431ce009af68e8ebe8714e54f8 | |
| parent | aa718861faaf0901677c54d8d350bce28f520e8c (diff) | |
| parent | b838c70f41b312978c75ab1a1960e5749981ed88 (diff) | |
Merge "Bug fix for odl l2"
3 files changed, 2 insertions, 5 deletions
diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_02_unarchive_odl_and_jdk.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_02_unarchive_odl_and_jdk.yml index 4dd8860f..9592a0ae 100644 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_02_unarchive_odl_and_jdk.yml +++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_02_unarchive_odl_and_jdk.yml @@ -23,4 +23,4 @@ - name: extract odl package command: | su -s /bin/sh -c "tar xzf /opt/{{ odl_pkg_name }} -C {{ odl_home }} \ - --strip-components 1 --no-overwrite-dir -k --skip-old-files" odl + --strip-components 1" odl diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_04_install_pip_packages.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_04_install_pip_packages.yml index 2610d618..fa418c6c 100644 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_04_install_pip_packages.yml +++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_04_install_pip_packages.yml @@ -14,9 +14,7 @@ tar xf /opt/{{ networking_odl_pkg_name }} rm -rf /opt/{{ networking_odl_pkg_name }} sed -i 's/^neutron-lib.*/neutron-lib/' {{ odl_pip }}/requirements.txt - pip install -r {{ odl_pip }}/requirements.txt tar zcf /opt/{{ networking_odl_pkg_name }} {{ odl_pip }} - rm -rf {{ odl_pip }} cd - - name: odl pip package install diff --git a/deploy/adapters/ansible/roles/odl_cluster/vars/main.yml b/deploy/adapters/ansible/roles/odl_cluster/vars/main.yml index f038c7a9..a968e3ec 100755 --- a/deploy/adapters/ansible/roles/odl_cluster/vars/main.yml +++ b/deploy/adapters/ansible/roles/odl_cluster/vars/main.yml @@ -51,7 +51,6 @@ jdk8_script_name: install_jdk8.tar common_packages_noarch: [] -odl_pip: - - networking-odl-3.2.0 +odl_pip: networking-odl-3.2.0 networking_odl_pkg_name: networking-odl-3.2.0.tar.gz |