Integration of CentOS8 and ipecompute nodes

4 files changed, 44 insertions, 25 deletions

diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 286a027..9f3cf79 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -5,14 +5,11 @@
     - epel-release
   when: ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux'
 
-- name: Add our repository with updates and overrides
-  yum_repository: name="{{ item.name }}" description= "{{ item.description | default('Ands repository') }}" baseurl="{{ item.url }}" enabled="yes" gpgcheck="no" cost="{{ item.cost | default(1) }}"
-  with_items: "{{ ands_repositories | default([]) }}"
-
-# We always update on first install and if requested
-- name: Update CentOS
-  yum: name=* state=latest update_cache=yes
-  when: (result | changed) or (os_update | default(false))
+- 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
diff --git a/roles/common/tasks/main_dnf.yml b/roles/common/tasks/main_dnf.yml
new file mode 100644
index 0000000..0572132
--- /dev/null
+++ b/roles/common/tasks/main_dnf.yml
@@ -0,0 +1,15 @@
+- name: Add our repository with updates and overrides
+  yum_repository: name="{{ item.name }}" description= "{{ item.description | default('Ands repository') }}" baseurl="{{ item.url }}" enabled="yes" gpgcheck="no" cost="{{ item.cost | default(1) }}"
+  with_items: "{{ ands_repositories | default([]) }}"
+
+# We always update on first install and if requested
+- name: Update CentOS
+  dnf: name=* state=latest
+  when: (result | changed) or (os_update | default(false))
+
+- name: Install various ansible requirements
+  package: name={{item}} state=present
+  with_items: 
+    - yum-plugin-versionlock
+    - python-rhsm-certificates
+#    - iptables-services
diff --git a/roles/common/tasks/main_yum.yml b/roles/common/tasks/main_yum.yml
new file mode 100644
index 0000000..2b320d5
--- /dev/null
+++ b/roles/common/tasks/main_yum.yml
@@ -0,0 +1,24 @@
+- name: Add our repository with updates and overrides
+  yum_repository: name="{{ item.name }}" description= "{{ item.description | default('Ands repository') }}" baseurl="{{ item.url }}" enabled="yes" gpgcheck="no" cost="{{ item.cost | default(1) }}"
+  with_items: "{{ ands_repositories | default([]) }}"
+
+# We always update on first install and if requested
+- name: Update CentOS
+  yum: name=* state=latest update_cache=yes
+  when: (result | changed) or (os_update | default(false))
+
+- name: Install various ansible requirements
+  package: name={{item}} state=present
+  with_items: 
+    - yum-plugin-versionlock
+    - libselinux-python
+    - libsemanage-python
+    - yamllint
+    - pyOpenSSL
+    - python-passlib
+    - python2-ruamel-yaml
+    - python2-jmespath
+    - python-ipaddress
+    - iptables-services
+    - PyYAML
+    - python-rhsm-certificates
diff --git a/roles/common/tasks/software.yml b/roles/common/tasks/software.yml
index c621ef3..3a1a5c1 100644
--- a/roles/common/tasks/software.yml
+++ b/roles/common/tasks/software.yml
@@ -1,19 +1,3 @@
-- name: Install various ansible requirements
-  package: name={{item}} state=present
-  with_items: 
-    - yum-plugin-versionlock
-    - libselinux-python
-    - libsemanage-python
-    - yamllint
-    - pyOpenSSL
-    - python-passlib
-    - python2-ruamel-yaml
-    - python2-jmespath
-    - python-ipaddress
-    - iptables-services
-    - PyYAML
-    - python-rhsm-certificates
-
 - name: Install various administrative tools
   package: name={{item}} state=present
   with_items: 
@@ -21,7 +5,6 @@
     - telnet
     - lsof
     - strace
-    - bzr
     - git
     - pciutils