ansible: Install java 1.8 on SLES nodes

Change-Id: I1bc39aa6b8e57a1ade363e14f8255a3ef439c58d
Signed-off-by: Kienan Stewart <kstewart@efficios.com>

diff --git a/automation/ansible/roles/common-node/tasks/setup-Suse.yml b/automation/ansible/roles/common-node/tasks/setup-Suse.yml
index c94f6fb0901225be194bf4917a6d564ab6025701..801dede9009216f33e94b2f0804fa12efd8964c4 100644 (file)
--- a/automation/ansible/roles/common-node/tasks/setup-Suse.yml
+++ b/automation/ansible/roles/common-node/tasks/setup-Suse.yml
@@ -1,4 +1,14 @@
 ---
+
+- name: Activate SLES Products
+  when: ansible_distribution == 'SLES'
+  include_role:
+    name: suse
+    tasks_from: product
+  loop: "{{common_node_products|default([])}}"
+  loop_control:
+    loop_var: 'product'
+
 - name: Ensure common_node patterns are installed.
   zypper: "name={{ common_node_patterns }} type=pattern state=present update_cache=yes"
 

diff --git a/automation/ansible/roles/common-node/vars/SLES-12.yml b/automation/ansible/roles/common-node/vars/SLES-12.yml
index eddf09ebc1c88cf6b7c41e8a95fe18be74daf581..4886367e11debba33fdc20f52431ca20dba2f40b 100644 (file)
--- a/automation/ansible/roles/common-node/vars/SLES-12.yml
+++ b/automation/ansible/roles/common-node/vars/SLES-12.yml
@@ -12,6 +12,8 @@ common_node_packages:
   - flex
   - gettext-runtime
   - git-core
+  - java-1_8_0-openjdk-devel
+  - java-1_8_0-openjdk-headless
   - java-11-openjdk-devel
   - java-11-openjdk-headless
 #  - jq

diff --git a/automation/ansible/roles/common-node/vars/SLES-15.yml b/automation/ansible/roles/common-node/vars/SLES-15.yml
index 5bfff8323e38b3a0ee5dff7ce57ac9e136d8d7e0..cc7c1d4071f46d8ede147e8d8139590ed73df337 100644 (file)
--- a/automation/ansible/roles/common-node/vars/SLES-15.yml
+++ b/automation/ansible/roles/common-node/vars/SLES-15.yml
@@ -11,6 +11,8 @@ common_node_packages:
   - flex
   - gettext-runtime
   - git-core
+  - java-1_8_0-openjdk-devel
+  - java-1_8_0-openjdk-headless
   - java-11-openjdk-devel
   - java-11-openjdk-headless
   - jq
@@ -25,3 +27,9 @@ common_node_packages:
   - sudo
 #  - tree
   - vim
+
+common_node_products:
+  # Required for sle-module-legacy
+  - sle-module-server-applications
+  # For java 1.8
+  - sle-module-legacy

diff --git a/automation/ansible/roles/common-node/vars/Suse.yml b/automation/ansible/roles/common-node/vars/Suse.yml
index 25ab51cc4afc3a2d985811b1f563e08316654216..7cbadc1ffd3b2808ca225d850b7ff5b9b9fa468a 100644 (file)
--- a/automation/ansible/roles/common-node/vars/Suse.yml
+++ b/automation/ansible/roles/common-node/vars/Suse.yml
@@ -12,6 +12,8 @@ common_node_packages:
   - flex
   - gettext-runtime
   - git-core
+  - java-1_8_0-openjdk-devel
+  - java-1_8_0-openjdk-headless
   - java-11-openjdk-devel
   - java-11-openjdk-headless
 #  - jq
@@ -25,3 +27,6 @@ common_node_packages:
   - sudo
   - tree
   - vim
+
+# For SLES
+common_node_products: []