summaryrefslogtreecommitdiffstats
path: root/deploy/adapters
diff options
context:
space:
mode:
authorYifei Xue <xueyifei@huawei.com>2016-10-11 23:36:51 +0800
committerYifei Xue <xueyifei@huawei.com>2016-10-11 23:38:18 +0800
commit1f39f0284d4452a67de41b1b196a36ad3fb9c82c (patch)
treeaef1efd158c09ff3d8cfc5b6031fea95b3a31de4 /deploy/adapters
parent63d8f65494ed9e57d29ed1ecbce1caba81677499 (diff)
Bug fix for jdk8 installation
JIRA: COMPASS-492 Change-Id: I17e41f7c32652454ff9ff4e788833c6502b5b9e6 Signed-off-by: Yifei Xue <xueyifei@huawei.com>
Diffstat (limited to 'deploy/adapters')
-rwxr-xr-xdeploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/odl_controller.yml10
-rwxr-xr-xdeploy/adapters/ansible/roles/odl_cluster/files/install_jdk8.tarbin4608 -> 0 bytes
-rwxr-xr-xdeploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml10
-rwxr-xr-xdeploy/adapters/ansible/roles/onos_cluster/files/install_jdk8.tarbin4608 -> 0 bytes
-rw-r--r--deploy/adapters/ansible/roles/onos_cluster/files/networking-onos.tarbin153600 -> 0 bytes
5 files changed, 16 insertions, 4 deletions
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
--- a/deploy/adapters/ansible/roles/odl_cluster/files/install_jdk8.tar
+++ /dev/null
Binary files 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
--- a/deploy/adapters/ansible/roles/onos_cluster/files/install_jdk8.tar
+++ /dev/null
Binary files 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
--- a/deploy/adapters/ansible/roles/onos_cluster/files/networking-onos.tar
+++ /dev/null
Binary files differ