diff options
| author | varac <varacanero@zeromail.org> | 2013-01-31 11:09:20 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-01-31 11:13:40 +0100 |
| commit | ab9a292f41139c5c5e36de87e03236e29dd27e23 (patch) | |
| tree | 14d59fd095a2e1c3a258371936d80e0109955378 /puppet/modules/site_config | |
| parent | 09649211f3c4b9ffd08af15deabe5916cf78df72 (diff) | |
puppet tags: site_config::default and site_config::slow
Diffstat (limited to 'puppet/modules/site_config')
| -rw-r--r-- | puppet/modules/site_config/manifests/default.pp (renamed from puppet/modules/site_config/manifests/init.pp) | 7 | ||||
| -rw-r--r-- | puppet/modules/site_config/manifests/hosts.pp | 2 | ||||
| -rw-r--r-- | puppet/modules/site_config/manifests/resolvconf.pp | 2 | ||||
| -rw-r--r-- | puppet/modules/site_config/manifests/slow.pp | 6 |
4 files changed, 11 insertions, 6 deletions
diff --git a/puppet/modules/site_config/manifests/init.pp b/puppet/modules/site_config/manifests/default.pp index f0ce9856..0605604b 100644 --- a/puppet/modules/site_config/manifests/init.pp +++ b/puppet/modules/site_config/manifests/default.pp @@ -1,4 +1,6 @@ -class site_config { +class site_config::default { + tag 'default' + $domain_hash = hiera('domain') # default class, used by all hosts @@ -23,7 +25,4 @@ class site_config { stage => initial, } - class { 'site_apt::dist_upgrade': - stage => initial, - } } diff --git a/puppet/modules/site_config/manifests/hosts.pp b/puppet/modules/site_config/manifests/hosts.pp index a5f1b105..6c00f3b6 100644 --- a/puppet/modules/site_config/manifests/hosts.pp +++ b/puppet/modules/site_config/manifests/hosts.pp @@ -3,7 +3,7 @@ class site_config::hosts() { $hosts = hiera('hosts','') $hostname = hiera('name') - $domain_public = $site_config::domain_hash['full_suffix'] + $domain_public = $site_config::default::domain_hash['full_suffix'] file { "/etc/hostname": ensure => present, diff --git a/puppet/modules/site_config/manifests/resolvconf.pp b/puppet/modules/site_config/manifests/resolvconf.pp index b803f17e..d73f0b78 100644 --- a/puppet/modules/site_config/manifests/resolvconf.pp +++ b/puppet/modules/site_config/manifests/resolvconf.pp @@ -11,7 +11,7 @@ class site_config::resolvconf { ensure => absent; } - $domain_public = $site_config::domain_hash['full_suffix'] + $domain_public = $site_config::default::domain_hash['full_suffix'] # 127.0.0.1: caching-only local bind # 87.118.100.175: http://server.privacyfoundation.de diff --git a/puppet/modules/site_config/manifests/slow.pp b/puppet/modules/site_config/manifests/slow.pp new file mode 100644 index 00000000..a4a9f19f --- /dev/null +++ b/puppet/modules/site_config/manifests/slow.pp @@ -0,0 +1,6 @@ +class site_config::slow { + + class { 'site_apt::dist_upgrade': + stage => initial, + } +} |