From f5417032bf86eaa73bf1dbfb143dd0a09ef1e66c Mon Sep 17 00:00:00 2001
From: Sander Cornelissen <scornelissen85@users.noreply.github.com>
Date: Sat, 14 Mar 2020 14:28:34 +0100
Subject: [PATCH] Merge OracleLinux in RedHat bootstrap-os (#5575)
* Merge OracleLinux in RedHat bootstrap-os
* Set default for use_oracle_public_repo in main.yaml
---
roles/bootstrap-os/defaults/main.yml | 4 ++++
roles/bootstrap-os/tasks/bootstrap-centos.yml | 23 +++++++++++++++++++
roles/bootstrap-os/tasks/bootstrap-oracle.yml | 21 -----------------
roles/bootstrap-os/tasks/main.yml | 5 +---
4 files changed, 28 insertions(+), 25 deletions(-)
delete mode 100644 roles/bootstrap-os/tasks/bootstrap-oracle.yml
diff --git a/roles/bootstrap-os/defaults/main.yml b/roles/bootstrap-os/defaults/main.yml
index e9fee74c8..ef8f4c2ea 100644
--- a/roles/bootstrap-os/defaults/main.yml
+++ b/roles/bootstrap-os/defaults/main.yml
@@ -9,6 +9,10 @@ centos_fastestmirror_enabled: false
# Disable locksmithd or leave it in its current state
coreos_locksmithd_disable: false
+## Oracle Linux specific variables
+# Install public repo on Oracle Linux
+use_oracle_public_repo: true
+
## General
# Set the hostname to inventory_hostname
override_system_hostname: true
diff --git a/roles/bootstrap-os/tasks/bootstrap-centos.yml b/roles/bootstrap-os/tasks/bootstrap-centos.yml
index 3e74e0d37..04b14ee4c 100644
--- a/roles/bootstrap-os/tasks/bootstrap-centos.yml
+++ b/roles/bootstrap-os/tasks/bootstrap-centos.yml
@@ -1,4 +1,27 @@
---
+# For Oracle Linux install public repo
+- name: Download Oracle Linux public yum repo
+ get_url:
+ url: https://yum.oracle.com/public-yum-ol7.repo
+ dest: /etc/yum.repos.d/public-yum-ol7.repo
+ when:
+ - use_oracle_public_repo|default(true)
+ - '"Oracle" in os_release.stdout'
+
+- name: Enable Oracle Linux repo
+ ini_file:
+ dest: /etc/yum.repos.d/public-yum-ol7.repo
+ section: "{{ item }}"
+ option: enabled
+ value: "1"
+ with_items:
+ - ol7_latest
+ - ol7_addons
+ - ol7_developer_EPEL
+ when:
+ - use_oracle_public_repo|default(true)
+ - '"Oracle" in os_release.stdout'
+
# CentOS ships with python installed
- name: Check if this is an atomic host
diff --git a/roles/bootstrap-os/tasks/bootstrap-oracle.yml b/roles/bootstrap-os/tasks/bootstrap-oracle.yml
deleted file mode 100644
index 5e1126e47..000000000
--- a/roles/bootstrap-os/tasks/bootstrap-oracle.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-- name: Download Oracle Linux public yum repo
- get_url:
- url: https://yum.oracle.com/public-yum-ol7.repo
- dest: /etc/yum.repos.d/public-yum-ol7.repo
-
-- name: Enable Oracle Linux repo
- ini_file:
- dest: /etc/yum.repos.d/public-yum-ol7.repo
- section: "{{ item }}"
- option: enabled
- value: "1"
- with_items:
- - ol7_latest
- - ol7_addons
- - ol7_developer_EPEL
-
-- name: Install packages requirements for bootstrap
- yum:
- name: container-selinux
- state: present
diff --git a/roles/bootstrap-os/tasks/main.yml b/roles/bootstrap-os/tasks/main.yml
index d35f7fd6d..c3e3e58cb 100644
--- a/roles/bootstrap-os/tasks/main.yml
+++ b/roles/bootstrap-os/tasks/main.yml
@@ -8,7 +8,7 @@
environment: {}
- include_tasks: bootstrap-centos.yml
- when: '"CentOS" in os_release.stdout or "Red Hat Enterprise Linux" in os_release.stdout'
+ when: '"CentOS" in os_release.stdout or "Red Hat Enterprise Linux" in os_release.stdout or "Oracle" in os_release.stdout'
- include_tasks: bootstrap-clearlinux.yml
when: '"Clear Linux OS" in os_release.stdout'
@@ -25,9 +25,6 @@
- include_tasks: bootstrap-opensuse.yml
when: '"openSUSE" in os_release.stdout'
-- include_tasks: bootstrap-oracle.yml
- when: '"Oracle" in os_release.stdout'
-
- name: Create remote_tmp for it is used by another module
file:
path: "{{ ansible_remote_tmp | default('~/.ansible/tmp') }}"
--
GitLab