Merge branch 'release/1.0.1'

Author: SolomonShorser-OICR

mini-seqware-install.yml

@@ -1,23 +1,23 @@
---- 
+---
 # file: mini-seqware-install.yml
 # This file is used for installing just SeqWare White Star as the bare-bones minimum to run SeqWare workflows
-   
+
 # The grid master depends on the hosts file, as we need to know at least who we
-# are by this stage. 
-- hosts: master 
+# are by this stage.
+- hosts: master
   sudo: True
   roles:
-    - { role: java, java_provider: Cloudera }
-    - { role: seqware-code, 
+    - { role: java, java_provider: Oracle8 }
+    - { role: seqware-code,
           seqware_provider: artifactory ,
-          user_name: seqware, 
-          setup_hdfs_user: False, 
+          user_name: seqware,
+          setup_hdfs_user: False,
           create_user: False,
-          workflow_engine: whitestar, 
+          workflow_engine: whitestar,
           sw_metadata_method: inmemory,
           oozie_work_dir: /datastore
       }
-    
+
 - hosts: master
   sudo: True
   roles:

roles/java/tasks/main.yml

@@ -6,3 +6,5 @@
 - include: 'openjdk7.yml'
   when: java_provider == "OpenJDK7"
 
+- include: 'oracle8.yml'
+  when: java_provider == "Oracle8"

roles/java/tasks/oracle8.yml

@@ -0,0 +1,26 @@
+---
+# file: roles/java/tasks/oracle8.yml
+
+- name: add repo for java 8
+  apt_repository: repo='ppa:webupd8team/java' state=present
+
+- name: set licence selected
+  shell: /bin/echo debconf shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections
+  sudo: yes
+  changed_when: false
+
+- name: set licence seen
+  shell: /bin/echo debconf shared/accepted-oracle-license-v1-1 seen true | /usr/bin/debconf-set-selections
+  sudo: yes
+  changed_when: false
+
+- name: install java 8
+  apt: name=oracle-java8-installer state=latest update-cache=yes force=yes
+  sudo: yes
+
+- name: Java | Set JAVA_HOME
+  lineinfile:
+    line: 'JAVA_HOME=/usr/lib/jvm/java-8-oracle'
+    dest: /etc/environment
+    state: present
+    create: yes

roles/java/vars/main.yml

@@ -1,4 +1,4 @@
 ---
 # file: roles/common/vars/main.yml
 
-java_provider: "OpenJDK7"
+java_provider: "Oracle8"

seqware-admin-webservice-install.yml

@@ -1,7 +1,7 @@
---- 
+---
 # file: seqware-admin-webservice-install.yml
 # This file is used for installing two hosts, a database server and a webapp server with the admin web service
-   
+
 # Not sure why, but I needed this to create a /etc/hosts that actually works with the Ubuntu image here on openstack
 - hosts: all
   sudo: True
@@ -15,15 +15,15 @@
     with_items: groups['all']
 
 # The grid master depends on the hosts file, as we need to know at least who we
-# are by this stage. 
-- hosts: dbserver 
+# are by this stage.
+- hosts: dbserver
   sudo: True
   roles:
-    - { role: java, java_provider: Cloudera }
+    - { role: java, java_provider: Oracle8 }
     - { role: postgres }
 
-- hosts: webserver 
+- hosts: webserver
   sudo: True
   roles:
-    - { role: java, java_provider: Cloudera }
+    - { role: java, java_provider: Oracle8 }
     - { role: glassfish }

seqware-install.yml

@@ -1,7 +1,7 @@
---- 
+---
 # file: seqware-install.yml
 # This file is used for installing a seqware cluster
-   
+
 # Not sure why, but I needed this to create a /etc/hosts that actually works with the Ubuntu image here on openstack
 - hosts: all
   sudo: True
@@ -31,9 +31,9 @@
 - hosts: all
   sudo: True
   tasks:
-  - name: Determine number of hosts in fugly way 
+  - name: Determine number of hosts in fugly way
     include: roles/common/tasks/determine_num_hosts.yml
-     
+
 - hosts: all
   sudo: True
   vars:
@@ -42,46 +42,46 @@
       lvm_device_whitelist: /dev/xvdd,/dev/xvde
   include: roles/storage/common/tasks/play_deploy_shared_storage.yml
   when: single_node_lvm is defined
-     
+
 - hosts: all
   sudo: True
   vars:
       shared_storage_system: glusterfs
       vendor_data: /mnt/seqware-oozie
-      glusterfs_version: 3.5 
+      glusterfs_version: 3.5
   include: roles/storage/common/tasks/play_deploy_shared_storage.yml
 
-- hosts: all 
+- hosts: all
   sudo: True
   roles:
     - { role: docker }
 
 # The grid master depends on the hosts file, as we need to know at least who we
-# are by this stage. 
-- hosts: master 
+# are by this stage.
+- hosts: master
   sudo: True
   roles:
-    - { role: java, java_provider: Cloudera }
+    - { role: java, java_provider: Oracle8 }
     - { role: grid-engine, grid_engine_master: True }
     - { role: seqware-master-infrastructure }
     - { role: seqware-code }
     - { role: seqware-webservice }
 
-- hosts: worker 
+- hosts: worker
   sudo: True
   roles:
-    - { role: java, java_provider: Cloudera }
+    - { role: java, java_provider: Oracle8 }
     - { role: grid-engine, grid_engine_master: False }
     - { role: seqware-worker-infrastructure }
-    
-- hosts: master 
+
+- hosts: master
   sudo: yes
   sudo_user: seqware
-  vars: 
+  vars:
       run_integration_tests: false
   roles:
     - { role: seqware-integration-tests, when: "{{ run_integration_tests }} == True" }
-    
+
 - hosts: master
   sudo: True
   roles: