From 3603b5a855b4e4553d3ea127f0833a5a89423dd0 Mon Sep 17 00:00:00 2001 From: Yifei Xue Date: Tue, 11 Oct 2016 23:36:51 +0800 Subject: Bug fix for jdk8 installation JIRA: COMPASS-492 Change-Id: I17e41f7c32652454ff9ff4e788833c6502b5b9e6 Signed-off-by: Yifei Xue (cherry picked from commit 1f39f0284d4452a67de41b1b196a36ad3fb9c82c) --- .../roles/odl_cluster/tasks/odl_controller.yml | 10 ++++++++-- .../ansible/roles/odl_cluster/files/install_jdk8.tar | Bin 4608 -> 0 bytes .../ansible/roles/odl_cluster/tasks/odl_controller.yml | 10 ++++++++-- .../ansible/roles/onos_cluster/files/install_jdk8.tar | Bin 4608 -> 0 bytes .../roles/onos_cluster/files/networking-onos.tar | Bin 153600 -> 0 bytes 5 files changed, 16 insertions(+), 4 deletions(-) delete mode 100755 deploy/adapters/ansible/roles/odl_cluster/files/install_jdk8.tar delete mode 100755 deploy/adapters/ansible/roles/onos_cluster/files/install_jdk8.tar delete mode 100644 deploy/adapters/ansible/roles/onos_cluster/files/networking-onos.tar (limited to 'deploy') diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/odl_controller.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/odl_controller.yml index 4cf7948a..00e00ccb 100755 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/odl_controller.yml +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/odl_controller.yml @@ -21,8 +21,14 @@ #" -- name: upload install_jdk8 scripts - unarchive: src=install_jdk8.tar dest=/opt/ +- name: download oracle-jdk8 script file + get_url: url="http://{{ http_server.stdout_lines[0] }}/packages/onos/{{ jdk8_script_name }}" dest=/opt/ + +- name: unarchive onos driver package + command: su -s /bin/sh -c "tar xvf /opt/install_jdk8.tar -C /opt/" + +#- name: upload install_jdk8 scripts +# unarchive: src=install_jdk8.tar dest=/opt/ - name: install install_jdk8 package command: su -s /bin/sh -c "/opt/install_jdk8/install_jdk8.sh" diff --git a/deploy/adapters/ansible/roles/odl_cluster/files/install_jdk8.tar b/deploy/adapters/ansible/roles/odl_cluster/files/install_jdk8.tar deleted file mode 100755 index faaaeb39..00000000 Binary files a/deploy/adapters/ansible/roles/odl_cluster/files/install_jdk8.tar and /dev/null differ diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml index f0ca1054..1ea5e0d2 100755 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml +++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml @@ -21,8 +21,14 @@ #" -- name: upload install_jdk8 scripts - unarchive: src=install_jdk8.tar dest=/opt/ +- name: download oracle-jdk8 script file + get_url: url="http://{{ http_server.stdout_lines[0] }}/packages/onos/{{ jdk8_script_name }}" dest=/opt/ + +- name: unarchive onos driver package + command: su -s /bin/sh -c "tar xvf /opt/install_jdk8.tar -C /opt/" + +#- name: upload install_jdk8 scripts +# unarchive: src=install_jdk8.tar dest=/opt/ - name: install install_jdk8 package command: su -s /bin/sh -c "/opt/install_jdk8/install_jdk8.sh" diff --git a/deploy/adapters/ansible/roles/onos_cluster/files/install_jdk8.tar b/deploy/adapters/ansible/roles/onos_cluster/files/install_jdk8.tar deleted file mode 100755 index faaaeb39..00000000 Binary files a/deploy/adapters/ansible/roles/onos_cluster/files/install_jdk8.tar and /dev/null differ diff --git a/deploy/adapters/ansible/roles/onos_cluster/files/networking-onos.tar b/deploy/adapters/ansible/roles/onos_cluster/files/networking-onos.tar deleted file mode 100644 index 9358199c..00000000 Binary files a/deploy/adapters/ansible/roles/onos_cluster/files/networking-onos.tar and /dev/null differ -- cgit 1.2.3-korg