Implement generic "os-base" role

This role includes the actual base role of the operating system
which is being used on the target system.

diff --git a/roles/apache2-php5/meta/main.yml b/roles/apache2-php5/meta/main.yml
index 48822fb23b54f326cb838228bf2e9119fbb1190b..da6c189e0b8b6e7ef32e6314dd7c6ba82c06d29f 100644 (file)
--- a/roles/apache2-php5/meta/main.yml
+++ b/roles/apache2-php5/meta/main.yml
@@ -2,4 +2,4 @@
 # apache2-php5 meta
 
 dependencies:
-  - { role: debian-base }
+  - { role: os-base }

diff --git a/roles/autofs/meta/main.yml b/roles/autofs/meta/main.yml
index 233305e59dfec3dd4da589ecd281da402c7a3ee6..5c8fc63d1c924f5c9a138a5e4afd57c84c03b8f0 100644 (file)
--- a/roles/autofs/meta/main.yml
+++ b/roles/autofs/meta/main.yml
@@ -2,4 +2,4 @@
 # autofs meta
 
 dependencies:
-  - { role: debian-base }
+  - { role: os-base }

diff --git a/roles/docker-engine/meta/main.yml b/roles/docker-engine/meta/main.yml
index c289cc50b34dc0f9d10d0768d98338ae89065337..475e84b73408c0e7a610acf168b57517f204eb67 100644 (file)
--- a/roles/docker-engine/meta/main.yml
+++ b/roles/docker-engine/meta/main.yml
@@ -2,4 +2,4 @@
 # meta file for docker-engine
 
 dependencies:
-  - { role: debian-base }
+  - { role: os-base }

diff --git a/roles/git-backup-script/meta/main.yml b/roles/git-backup-script/meta/main.yml
index faac37bada12b3c844c2a3a6a5826fcfa64b449f..72116372a24e6f7ee5372676be96494b86a8544d 100644 (file)
--- a/roles/git-backup-script/meta/main.yml
+++ b/roles/git-backup-script/meta/main.yml
@@ -2,4 +2,4 @@
 # git-backup-scripts meta
 
 dependencies:
-  - { role: debian-base }
+  - { role: os-base }

diff --git a/roles/git-configscripts/meta/main.yml b/roles/git-configscripts/meta/main.yml
index 4d25b425e2fbd63d7d3db43be95359ecd5fb672d..3614e04ca2101b385ca42730d18f2263173088d6 100644 (file)
--- a/roles/git-configscripts/meta/main.yml
+++ b/roles/git-configscripts/meta/main.yml
@@ -2,4 +2,4 @@
 # git-configscripts meta
 
 dependencies:
-  - { role: debian-base }
+  - { role: os-base }

diff --git a/roles/git-nagcollect/meta/main.yml b/roles/git-nagcollect/meta/main.yml
index e7982e0f06ee6edef22cd8c21c4eb9f0187299ee..01b75f98cf0bb78eb10d77e94f230a2766ed6f6a 100644 (file)
--- a/roles/git-nagcollect/meta/main.yml
+++ b/roles/git-nagcollect/meta/main.yml
@@ -2,4 +2,4 @@
 # git-nagcollect meta
 
 dependencies:
-  - { role: debian-base }
+  - { role: os-base }

diff --git a/roles/lcmc-cluster-node/meta/main.yml b/roles/lcmc-cluster-node/meta/main.yml
index a940e95a1b4ef38669b34b924aa454ceb8274f51..d3cca53a9b8cb7ebfb4c3875ff952582e641d4f2 100644 (file)
--- a/roles/lcmc-cluster-node/meta/main.yml
+++ b/roles/lcmc-cluster-node/meta/main.yml
@@ -2,6 +2,6 @@
 # lcmc-cluster-node meta
 
 dependencies:
-  - { role: debian-base }
+  - { role: os-base }
   - { role: sshd }
   - { role: ntpd }

diff --git a/roles/linux-zfs/meta/main.yml b/roles/linux-zfs/meta/main.yml
index e6f096c4dc56b0ec94dd27238f8eac554cb2c15e..1911c9e2f1a44eeea436c2494a3d0b2df8d63d52 100644 (file)
--- a/roles/linux-zfs/meta/main.yml
+++ b/roles/linux-zfs/meta/main.yml
@@ -2,4 +2,4 @@
 # meta file for linux-zfs
 
 dependencies:
-  - { role: debian-base }
+  - { role: os-base }

diff --git a/roles/mysql-server/meta/main.yml b/roles/mysql-server/meta/main.yml
index a83b89419176cb7b7dbe0e595f9145cdf2bbb7cc..f04ae9d989e2128173025757a1aaa7946503effd 100644 (file)
--- a/roles/mysql-server/meta/main.yml
+++ b/roles/mysql-server/meta/main.yml
@@ -2,4 +2,4 @@
 # mysql-server meta
 
 dependencies:
-  - { role: debian-base }
+  - { role: os-base }

diff --git a/roles/nfs-client/meta/main.yml b/roles/nfs-client/meta/main.yml
index 4eaf4ee7b902b007f7b278ec26a9ca667d7366e7..47cd032151b91bda39610e0965bc48e803f7802d 100644 (file)
--- a/roles/nfs-client/meta/main.yml
+++ b/roles/nfs-client/meta/main.yml
@@ -2,4 +2,4 @@
 # nfs-client meta
 
 dependencies:
-  - { role: debian-base }
+  - { role: os-base }

diff --git a/roles/ntpd/meta/main.yml b/roles/ntpd/meta/main.yml
index 0abafc55ad2d97a27d75f6af77436ad9ad3e3ce7..07d88c561edda3d2adb81aec54d2fa4032e77217 100644 (file)
--- a/roles/ntpd/meta/main.yml
+++ b/roles/ntpd/meta/main.yml
@@ -2,4 +2,4 @@
 # ntpd meta
 
 dependencies:
-  - { role: debian-base }
+  - { role: os-base }

diff --git a/roles/os-base/meta/main.yml b/roles/os-base/meta/main.yml
new file mode 100644 (file)
index 0000000..41b1ea3
--- /dev/null
+++ b/roles/os-base/meta/main.yml
@@ -0,0 +1,5 @@
+---
+# meta file for os-base
+
+dependencies:
+  - { role: debian-base, when: "ansible_distribution == 'Debian'" }

diff --git a/roles/postfix/meta/main.yml b/roles/postfix/meta/main.yml
index 2f117cb948b2891483e8eea7fd9bb884a2608bf7..d8180ebdb4a293952f78a248ef57f6c65745ac85 100644 (file)
--- a/roles/postfix/meta/main.yml
+++ b/roles/postfix/meta/main.yml
@@ -2,4 +2,4 @@
 # postfix meta
 
 dependencies:
-  - { role: debian-base }
+  - { role: os-base }

diff --git a/roles/sshd/meta/main.yml b/roles/sshd/meta/main.yml
index 21fa3c57e8320fcae60fadc86634be54c5e9d25c..c449a031c46359be8920471c586bc789a77c7e00 100644 (file)
--- a/roles/sshd/meta/main.yml
+++ b/roles/sshd/meta/main.yml
@@ -2,4 +2,4 @@
 # sshd meta
 
 dependencies:
-  - { role: debian-base }
+  - { role: os-base }

diff --git a/roles/zabbix-agent/meta/main.yml b/roles/zabbix-agent/meta/main.yml
index 979b5d5e550a6b5ae39897d8e0ba176ee4a2ed09..0f5df846d10fb5eb271b3e538e898ec88343949f 100644 (file)
--- a/roles/zabbix-agent/meta/main.yml
+++ b/roles/zabbix-agent/meta/main.yml
@@ -2,4 +2,4 @@
 # zabbix-agent meta
 
 dependencies:
-  - { role: debian-base }
+  - { role: os-base }