moved most includes to site_config

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
+
+}