From 3730114dbb3dffa0d496ff5aaf42c8d54bee8f80 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 29 Jun 2015 16:49:15 -0300
Subject: More changes for puppet 3.x

---
 manifests/bootstrap/configurator.pp | 2 +-
 manifests/bootstrap/host.pp         | 3 ---
 manifests/bootstrap/master.pp       | 3 ---
 3 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'manifests/bootstrap')

diff --git a/manifests/bootstrap/configurator.pp b/manifests/bootstrap/configurator.pp
index d93a0ce..edcbe92 100644
--- a/manifests/bootstrap/configurator.pp
+++ b/manifests/bootstrap/configurator.pp
@@ -74,7 +74,7 @@ file { "$bootstrap_path/auth.conf":
 #
 # Basic users
 #
-file { "$bootstrap_path/manifests/classes/users.pp":
+file { "$bootstrap_path/modules/site_users/manifests/init.pp":
   ensure  => present,
   mode    => 0644,
   content => template("$templates/puppet/users.pp.erb"),
diff --git a/manifests/bootstrap/host.pp b/manifests/bootstrap/host.pp
index c1aead8..c403eea 100644
--- a/manifests/bootstrap/host.pp
+++ b/manifests/bootstrap/host.pp
@@ -4,9 +4,6 @@
 # virtual machine.
 #
 
-# Import site configuration
-import "../site.pp"
-
 # The server role
 include nodo::role::server
 
diff --git a/manifests/bootstrap/master.pp b/manifests/bootstrap/master.pp
index 51167f3..73c075c 100644
--- a/manifests/bootstrap/master.pp
+++ b/manifests/bootstrap/master.pp
@@ -5,8 +5,5 @@
 # Once it's running it can setup all the other nodes.
 #
 
-# Import site configuration
-import "../site.pp"
-
 # Include the master node configuration
 include nodo::role::master
-- 
cgit v1.2.3