aboutsummaryrefslogtreecommitdiff
path: root/manifests/role
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-09-11 22:17:43 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-09-11 22:17:43 -0300
commit9873d7f131b156c88ba6a87c45c0b911a0986dba (patch)
treeeb6e6e8202d5418ad4c4f862a7f9eaf40ae8b096 /manifests/role
parent1564ca8593730f0cd5f4d69dcf5a860f73efccb4 (diff)
downloadpuppet-nodo-9873d7f131b156c88ba6a87c45c0b911a0986dba.tar.gz
puppet-nodo-9873d7f131b156c88ba6a87c45c0b911a0986dba.tar.bz2
Virtual fixes
Diffstat (limited to 'manifests/role')
-rw-r--r--manifests/role/bitcoin.pp2
-rw-r--r--manifests/role/mail.pp2
-rw-r--r--manifests/role/master.pp4
3 files changed, 4 insertions, 4 deletions
diff --git a/manifests/role/bitcoin.pp b/manifests/role/bitcoin.pp
index e1e7e08..0cfe25f 100644
--- a/manifests/role/bitcoin.pp
+++ b/manifests/role/bitcoin.pp
@@ -1,5 +1,5 @@
class nodo::role::bitcoin inherits nodo::base::vserver {
- include nodo::role::vserver
+ include nodo::role::virtual
include onion
include onion::socks
include onion::ssh
diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index 0f5ba04..2383ada 100644
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -1,5 +1,5 @@
class nodo::role::mail {
- class { [ 'nodo::role::vserver', 'mail::system' ]: }
+ class { [ 'nodo::role::virtual', 'mail::system' ]: }
# Config parameters
$delivery = hiera('nodo::subsystem::mail::delivery', 'exim')
diff --git a/manifests/role/master.pp b/manifests/role/master.pp
index fb77bcb..5b6bfcf 100644
--- a/manifests/role/master.pp
+++ b/manifests/role/master.pp
@@ -7,7 +7,7 @@ class nodo::role::master {
}
if $main == true {
- # Puppetmaster should be included before nodo::vserver
+ # Puppetmaster should be included before nodo::virtual
class { 'puppet::master':
main => true,
}
@@ -40,7 +40,7 @@ class nodo::role::master {
}
# These should be included after puppetmaster
- include nodo::role::vserver
+ include nodo::role::virtual
include database
include git::daemon
include nagios::headless