Parcourir la source

hiera: Switch to full hiera based configuration

Sebastien Badia il y a 8 ans
Parent
commit
e799f19849
4 fichiers modifiés avec 9 ajouts et 21 suppressions
  1. 1 1
      manifests/apt.pp
  2. 6 19
      manifests/common.pp
  3. 1 1
      manifests/dns/authoritative.pp
  4. 1 0
      metadata.json

+ 1 - 1
manifests/apt.pp

@@ -6,7 +6,7 @@
 
 class public::apt {
 
-  include ::apt
+  include '::apt'
 
   # setup http://ftp.fr.debian.org/{debian,ubuntu}
   $downcase_lsbdistid = downcase($::lsbdistid)

+ 6 - 19
manifests/common.pp

@@ -12,17 +12,16 @@
 #
 class public::common {
 
+  # Internal
   include '::public::apt'
+
+  # External (hiera for configuration)
+  include '::dnsclient'
   include '::etckeeper'
+  include '::locales'
   include '::rsyslog::client'
   include '::sudo'
-
-  class {'dnsclient':
-    nameservers => hiera_array('nameservers', undef),
-    options     => 'UNSET',
-    search      => hiera('domain'),
-    domain      => hiera('domain'),
-  }
+  include '::timezone'
 
   # TODO, apt-proxy
 
@@ -32,18 +31,6 @@ class public::common {
     ensure => purged,
   }
 
-  # Setup timezone
-  class {
-    'timezone':
-      timezone    => hiera('timezone'),
-      autoupgrade => false;
-  }
-
-  class {'locales':
-    default_locale => 'en_US.UTF-8',
-    locales        => hiera('locales')
-  }
-
   ensure_packages(['tmux','screen','netcat','htop','rsync','host','dmraid',
     'man-db','vim','zsh','bash','iputils-ping','dnsutils','logrotate',
     'python-apt','aptitude','debian-goodies','molly-guard'])

+ 1 - 1
manifests/dns/authoritative.pp

@@ -11,7 +11,7 @@
 #
 class public::dns::authoritative {
 
-  include 'bind'
+  include '::bind'
 
   package { 'zonecheck':
     ensure => installed,

+ 1 - 0
metadata.json

@@ -17,6 +17,7 @@
     { "name": "puppetlabs/stdlib", "version_requirement": ">= 4.2.0 <5.0.0" },
     { "name": "puppetlabs/apt", "version_requirement": ">=1.8.0 <3.0.0" },
     { "name": "saz/sudo", "version_requirement": ">=3.1.0 <4.0.0" },
+    { "name": "thias/bind", "version_requirement": ">=0.5.1 <1.0.0" },
     { "name": "saz/rsyslog", "version_requirement": ">=3.3.0 <4.0.0" },
     { "name": "thomasvandoren/etckeeper", "version_requirement": ">=0.0.9 <1.0.0" }
   ],