From 0ab18bc91fa84df2c457ca1ea43ebebc65e5bb2b Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 1 Feb 2013 21:46:06 +0100 Subject: moved concat::setup to site_config::default Because in site.pp it didn't get the tag "leap_base" and would not be declared with leap cli's default puppet tags. Fixes: parent directory /var/lib/puppet/concat does not exist (Feature#1625) --- puppet/manifests/site.pp | 2 -- puppet/modules/site_config/manifests/default.pp | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'puppet') diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index d422bef7..53b452d1 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -5,9 +5,7 @@ stage { 'initial': before => Stage['main'], } -# prerequisites import 'common' -include concat::setup include site_config::default include site_config::slow diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp index 14b389e8..c65c0799 100644 --- a/puppet/modules/site_config/manifests/default.pp +++ b/puppet/modules/site_config/manifests/default.pp @@ -3,6 +3,8 @@ class site_config::default { $domain_hash = hiera('domain') + include concat::setup + # default class, used by all hosts include lsb, git -- cgit v1.2.3