updated site.pp with trusted roles
This commit is contained in:
		
							parent
							
								
									1d55cd96ce
								
							
						
					
					
						commit
						095f3ac488
					
				@ -14,6 +14,7 @@ mod 'ghoneycutt-ssh', '3.61.0'
 | 
				
			|||||||
mod 'puppet-selinux', '3.1.0'
 | 
					mod 'puppet-selinux', '3.1.0'
 | 
				
			||||||
mod 'puppetlabs-puppetserver_gem', '1.1.1'
 | 
					mod 'puppetlabs-puppetserver_gem', '1.1.1'
 | 
				
			||||||
mod 'puppetlabs-motd', '4.0.0'
 | 
					mod 'puppetlabs-motd', '4.0.0'
 | 
				
			||||||
 | 
					mod 'puppetlabs-bootstrap', '2.0.0'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Modules from Git
 | 
					# Modules from Git
 | 
				
			||||||
# Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples
 | 
					# Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples
 | 
				
			||||||
 | 
				
			|||||||
@ -30,17 +30,11 @@ node 'puppet' {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#node default {
 | 
					node default {
 | 
				
			||||||
 | 
					 | 
				
			||||||
#    if $trusted['extentions']['pp_role'] {
 | 
					 | 
				
			||||||
#      include ($trusted['extentions']['pp_role'])
 | 
					 | 
				
			||||||
#    } else {
 | 
					 | 
				
			||||||
#      include role::node
 | 
					 | 
				
			||||||
#  }
 | 
					 | 
				
			||||||
#}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
node 'default' {
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    include role::node
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if $trusted['extensions']['pp_role'] {
 | 
				
			||||||
 | 
					      include "role::${trusted['extensions']['pp_role']}"
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					      include role::node
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user