summaryrefslogtreecommitdiffstats
path: root/roles/common
diff options
context:
space:
mode:
Diffstat (limited to 'roles/common')
-rw-r--r--roles/common/tasks/install.yml24
-rw-r--r--roles/common/tasks/main.yml27
-rw-r--r--roles/common/tasks/main_dnf.yml2
-rw-r--r--roles/common/tasks/update.yml16
4 files changed, 44 insertions, 25 deletions
diff --git a/roles/common/tasks/install.yml b/roles/common/tasks/install.yml
new file mode 100644
index 0000000..9f3cf79
--- /dev/null
+++ b/roles/common/tasks/install.yml
@@ -0,0 +1,24 @@
+- name: Ensure all required repositories are configured
+ package: name={{item}} state=present
+ register: result
+ with_items:
+ - epel-release
+ when: ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux'
+
+- include_tasks: main_yum.yml
+ when: ansible_pkg_mgr == 'yum'
+
+- include_tasks: main_dnf.yml
+ when: ansible_pkg_mgr == 'dnf'
+
+- name: Install additional software
+ include_tasks: software.yml
+
+- name: Configure git
+ shell: |
+ git config --global http.sslVerify false
+ git config --global user.name "Suren A. Chilingaryan"
+ git config --global user.email csa@suren.me
+ exit 0
+ args:
+ executable: /bin/bash
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 9f3cf79..9f0b72c 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -1,24 +1,3 @@
-- name: Ensure all required repositories are configured
- package: name={{item}} state=present
- register: result
- with_items:
- - epel-release
- when: ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux'
-
-- include_tasks: main_yum.yml
- when: ansible_pkg_mgr == 'yum'
-
-- include_tasks: main_dnf.yml
- when: ansible_pkg_mgr == 'dnf'
-
-- name: Install additional software
- include_tasks: software.yml
-
-- name: Configure git
- shell: |
- git config --global http.sslVerify false
- git config --global user.name "Suren A. Chilingaryan"
- git config --global user.email csa@suren.me
- exit 0
- args:
- executable: /bin/bash
+---
+- name: "Configuring OpenShift"
+ include_tasks: "{{ subrole | default('install') }}.yml"
diff --git a/roles/common/tasks/main_dnf.yml b/roles/common/tasks/main_dnf.yml
index 0572132..792a52a 100644
--- a/roles/common/tasks/main_dnf.yml
+++ b/roles/common/tasks/main_dnf.yml
@@ -5,7 +5,7 @@
# We always update on first install and if requested
- name: Update CentOS
dnf: name=* state=latest
- when: (result | changed) or (os_update | default(false))
+ when: (result is changed) or (os_update | default(false))
- name: Install various ansible requirements
package: name={{item}} state=present
diff --git a/roles/common/tasks/update.yml b/roles/common/tasks/update.yml
new file mode 100644
index 0000000..db8ae39
--- /dev/null
+++ b/roles/common/tasks/update.yml
@@ -0,0 +1,16 @@
+- name: Ensure all required repositories are configured
+ package: name={{item}} state=present
+ register: result
+ with_items:
+ - epel-release
+ when: ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux'
+
+- include_tasks: main_yum.yml
+ when: ansible_pkg_mgr == 'yum'
+ vars:
+ os_update: true
+
+- include_tasks: main_dnf.yml
+ when: ansible_pkg_mgr == 'dnf'
+ vars:
+ os_update: true