From fe0928570a447c2ba9b1f8a02460e41ed486c450 Mon Sep 17 00:00:00 2001 From: Alexander Barton Date: Tue, 20 Oct 2015 14:58:28 +0200 Subject: [PATCH] Implement generic "os-base" role This role includes the actual base role of the operating system which is being used on the target system. --- roles/apache2-php5/meta/main.yml | 2 +- roles/autofs/meta/main.yml | 2 +- roles/docker-engine/meta/main.yml | 2 +- roles/git-backup-script/meta/main.yml | 2 +- roles/git-configscripts/meta/main.yml | 2 +- roles/git-nagcollect/meta/main.yml | 2 +- roles/lcmc-cluster-node/meta/main.yml | 2 +- roles/linux-zfs/meta/main.yml | 2 +- roles/mysql-server/meta/main.yml | 2 +- roles/nfs-client/meta/main.yml | 2 +- roles/ntpd/meta/main.yml | 2 +- roles/os-base/meta/main.yml | 5 +++++ roles/postfix/meta/main.yml | 2 +- roles/sshd/meta/main.yml | 2 +- roles/zabbix-agent/meta/main.yml | 2 +- 15 files changed, 19 insertions(+), 14 deletions(-) create mode 100644 roles/os-base/meta/main.yml diff --git a/roles/apache2-php5/meta/main.yml b/roles/apache2-php5/meta/main.yml index 48822fb..da6c189 100644 --- 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 233305e..5c8fc63 100644 --- 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 c289cc5..475e84b 100644 --- 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 faac37b..7211637 100644 --- 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 4d25b42..3614e04 100644 --- 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 e7982e0..01b75f9 100644 --- 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 a940e95..d3cca53 100644 --- 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 e6f096c..1911c9e 100644 --- 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 a83b894..f04ae9d 100644 --- 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 4eaf4ee..47cd032 100644 --- 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 0abafc5..07d88c5 100644 --- 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 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 2f117cb..d8180eb 100644 --- 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 21fa3c5..c449a03 100644 --- 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 979b5d5..0f5df84 100644 --- 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 } -- 2.39.2