From 9d4f47a2b6f3231e870249823dbe0f7db1baa111 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 4 Mar 2014 13:35:18 -0300
Subject: Misc improvements and cleanup

---
 manifests/classes/configurator.pp |  2 +-
 manifests/host.pp                 |  4 ++--
 manifests/master.pp               |  5 ++---
 manifests/repository.pp           | 15 ---------------
 manifests/vagrant.pp              |  9 +++++++--
 5 files changed, 12 insertions(+), 23 deletions(-)
 delete mode 100644 manifests/repository.pp

(limited to 'manifests')

diff --git a/manifests/classes/configurator.pp b/manifests/classes/configurator.pp
index b9b7e9e..cf2d891 100644
--- a/manifests/classes/configurator.pp
+++ b/manifests/classes/configurator.pp
@@ -1,5 +1,5 @@
 #
-# Puppet Bootstrap Configuration Manifest
+# Puppet Bootstrap Configuration Manifest.
 #
 # This file is responsible to set custom configuration in the bootstrap
 # repository for values set in the hiera configuration.
diff --git a/manifests/host.pp b/manifests/host.pp
index 6cb2927..ea23fb4 100644
--- a/manifests/host.pp
+++ b/manifests/host.pp
@@ -4,8 +4,8 @@
 # virtual machine.
 #
 
-# Import the needed config and modules
-import "nodo"
+# Import site configuration
+import "site.pp"
 
 # The server role
 include nodo::role::server
diff --git a/manifests/master.pp b/manifests/master.pp
index 0b64523..f53f00e 100644
--- a/manifests/master.pp
+++ b/manifests/master.pp
@@ -5,9 +5,8 @@
 # Once it's running it can setup all the other nodes.
 #
 
-# Import the needed config and modules
-import "config.pp"
-import "nodo"
+# Import site configuration
+import "site.pp"
 
 # Include the master node configuration
 include nodo::role::master
diff --git a/manifests/repository.pp b/manifests/repository.pp
deleted file mode 100644
index 9564123..0000000
--- a/manifests/repository.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# This manifest is intended to generate the initial
-# puppet repository.
-#
-
-# Import the needed config and modules
-import "config.pp"
-import "classes/puppet_bootstrap.pp"
-
-# Setup modules for use with other stages
-include puppet_bootstrap
-
-puppet_bootstrap::puppet_modules{ "modules":
-  puppet_dir => "$puppet_bootstrap_tmpdir",
-}
diff --git a/manifests/vagrant.pp b/manifests/vagrant.pp
index 94d5896..7e6c6c7 100644
--- a/manifests/vagrant.pp
+++ b/manifests/vagrant.pp
@@ -1,5 +1,10 @@
-# Import main module
-import "nodo"
+#
+# This manifest is intended to configure a vagrant
+# virtual machine.
+#
+
+# Import site configuration
+import "site.pp"
 
 #
 # Stage definitions
-- 
cgit v1.2.3