From 9e38736b93a6b737ecb53d1f41dadf45cbb22c1c Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@suren.me>
Date: Fri, 25 Oct 2019 00:19:07 +0200
Subject: Various stuff to pre-configure compute nodes

---
 roles/devel/defaults/main.yml |  2 ++
 roles/devel/tasks/dnf.yml     |  9 +++++----
 roles/devel/tasks/main.yml    | 10 +++++-----
 roles/devel/vars/centos-7.yml |  1 +
 roles/devel/vars/main.yml     |  1 -
 5 files changed, 13 insertions(+), 10 deletions(-)
 create mode 100644 roles/devel/defaults/main.yml
 create mode 100644 roles/devel/vars/centos-7.yml
 delete mode 100644 roles/devel/vars/main.yml

(limited to 'roles/devel')

diff --git a/roles/devel/defaults/main.yml b/roles/devel/defaults/main.yml
new file mode 100644
index 0000000..18215c8
--- /dev/null
+++ b/roles/devel/defaults/main.yml
@@ -0,0 +1,2 @@
+common_packages: [ cmake, libdb-devel, libnl3-devel, elfutils-devel, numactl-devel, boost-devel, tcl, tk ]
+extra_packages: []
diff --git a/roles/devel/tasks/dnf.yml b/roles/devel/tasks/dnf.yml
index 350108a..bd6e452 100644
--- a/roles/devel/tasks/dnf.yml
+++ b/roles/devel/tasks/dnf.yml
@@ -1,5 +1,6 @@
 - name: Install development package groups
-  dnf: name={{item}} state=present
-  with_items: 
-    - "@Development and Creative Workstation"
-    
+  dnf: 
+    state: present
+    name: 
+        - "@Development Tools"
+        - "@RPM Development Tools"
diff --git a/roles/devel/tasks/main.yml b/roles/devel/tasks/main.yml
index d42dd31..7d08a15 100644
--- a/roles/devel/tasks/main.yml
+++ b/roles/devel/tasks/main.yml
@@ -8,12 +8,12 @@
         - "{{ ansible_distribution|lower }}.yml"
         - "{{ ansible_os_family|lower }}.yml"
 
-- include_tasks: dnf.yml
-  when:  ansible_distribution | lower == 'fedora'
-
 - include_tasks: yum.yml
-  when: (ansible_os_family | lower == 'redhat') and (ansible_distribution | lower != 'fedora')
+  when: ansible_pkg_mgr == 'yum' 
+  
+- include_tasks: dnf.yml
+  when: ansible_pkg_mgr == 'dnf'
 
 - name: Install various development packages
   package: name={{item}} state=present
-  with_items: "{{ common_packages | union(packages | default([])) }}"
+  with_items: "{{ common_packages | union ( extra_packages | default([]) ) | union(packages | default([])) }}"
diff --git a/roles/devel/vars/centos-7.yml b/roles/devel/vars/centos-7.yml
new file mode 100644
index 0000000..a276957
--- /dev/null
+++ b/roles/devel/vars/centos-7.yml
@@ -0,0 +1 @@
+extra_packages: [ doxygen, libmnl-devel, libconfig-devel, iptables-devel ]
diff --git a/roles/devel/vars/main.yml b/roles/devel/vars/main.yml
deleted file mode 100644
index 9024160..0000000
--- a/roles/devel/vars/main.yml
+++ /dev/null
@@ -1 +0,0 @@
-common_packages: [ cmake, doxygen, libdb-devel, libnl3-devel, libmnl-devel, elfutils-devel, iptables-devel, numactl-devel, boost-devel, tcl, tk, libconfig-devel ]
\ No newline at end of file
-- 
cgit v1.2.1