Skip to content

Commit

Permalink
get rid of node inheritance (future parser compatibility)
Browse files Browse the repository at this point in the history
Signed-off-by: Pavel Pulec <[email protected]>
  • Loading branch information
Pavel Pulec committed Apr 26, 2017
1 parent 23b1055 commit e80eff8
Showing 1 changed file with 16 additions and 9 deletions.
25 changes: 16 additions & 9 deletions vagrant/puppet/manifests/site.pp
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
node default {
# puppetmaster
node puppet {

# this will get put on every host...
$url = 'https://ttboj.wordpress.com/'
file { '/etc/motd':
content => "This is Puppet-Gluster+Vagrant! (${url})\n",
content => "This is Puppet-Gluster+Vagrant! (https://ttboj.wordpress.com/)\n",
}
}

# puppetmaster
node puppet inherits default {

if "${::vagrant_gluster_firewall}" != 'false' {
include firewall
Expand Down Expand Up @@ -38,7 +35,12 @@
}
}

node /^annex\d+$/ inherits default { # annex{1,2,..N}
node /^annex\d+$/ { # annex{1,2,..N}

# this will get put on every host...
file { '/etc/motd':
content => "This is Puppet-Gluster+Vagrant! (https://ttboj.wordpress.com/)\n",
}

if "${::vagrant_gluster_firewall}" != 'false' {
include firewall
Expand Down Expand Up @@ -105,7 +107,12 @@
}
}

node /^client\d+$/ inherits default { # client{1,2,..N}
node /^client\d+$/ { # client{1,2,..N}

# this will get put on every host...
file { '/etc/motd':
content => "This is Puppet-Gluster+Vagrant! (https://ttboj.wordpress.com/)\n",
}

if "${::vagrant_gluster_firewall}" != 'false' {
include firewall
Expand Down

0 comments on commit e80eff8

Please sign in to comment.