aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2016-11-24 08:42:09 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-24 08:42:09 +0000
commit168672fc169cac866f9689260c105cf141a567ad (patch)
treef4e3e806117cf980dd80094ea8a745e280be994f
parented09a78e4a368958ee3097a3f35c139f713dc447 (diff)
parent3603b5a855b4e4553d3ea127f0833a5a89423dd0 (diff)
Merge "Bug fix for jdk8 installation" into stable/colorado
-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