summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2012-10-04 22:34:20 +0200
committervarac <varacanero@zeromail.org>2012-10-04 22:34:20 +0200
commitb7277a8c666248a2a134f1d5b84c994df9904b7c (patch)
treee2b1faf8f2bc693f9802687b0ac196ed296a9c37
parentad018cb7c6b85252783e0f8ae5ce26afcc37d9e8 (diff)
moved most includes to site_config
-rw-r--r--puppet/manifests/site.pp18
-rw-r--r--puppet/modules/site_config/manifests/init.pp7
2 files changed, 13 insertions, 12 deletions
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 3ae9ebea..89c97888 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -1,22 +1,16 @@
node 'default' {
+ # prerequisites
+ import 'common'
+ include concat::setup
# include some basic classes
- # $concat_basedir = '/var/lib/puppet/modules/concat' # do we need this ?
- include concat::setup
- include apt, lsb, git
- import 'common'
+ #include site_config
+ # parse services for host
$services=hiera_array('services')
notice("Services for $fqdn: $services")
- # configure ssh and inculde ssh-keys
- #include sshd
- $ssh_keys=hiera_hash('ssh_keys')
- include site_sshd
- notice($ssh_keys)
- create_resources('site_sshd::ssh_key', $ssh_keys)
-
-
+ # configure eip
if 'eip' in $services {
include site_config::eip
}
diff --git a/puppet/modules/site_config/manifests/init.pp b/puppet/modules/site_config/manifests/init.pp
new file mode 100644
index 00000000..64eb06f4
--- /dev/null
+++ b/puppet/modules/site_config/manifests/init.pp
@@ -0,0 +1,7 @@
+class site_config {
+ include apt, lsb, git
+
+ # configure ssh and inculde ssh-keys
+ include site_config::sshd
+
+}