Bug fix for odl l2

JIRA: COMPASS-512

1. Correct the script of unarchiving odl package for rerunnable
2. Delete the useless code in the script of installing networking-odl
3. Correct the variable "odl_pip" in vars/main.yml

Change-Id: I5488dd4caedcbda735de24fd594207d66310e828
Signed-off-by: Yifei Xue <xueyifei@huawei.com>

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 4dd8860..9592a0a 100644 (file)
--- 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 2610d61..fa418c6 100644 (file)
--- 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 f038c7a..a968e3e 100755 (executable)
--- 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