opendev/puppet-ssh
Code Issues Proposed changes

Add the trusted source as class parameter

Browse Source 
Remove the hardcoded puppetmaster.openstack.org value
from the template but keep it as default parameter
value for ssh class.

Change-Id: I4b07f78ed455841cc2301227e42222ca96b24821
This commit is contained in:
Fabien Boucher
2015-03-25 14:54:32 +00:00
parent a078dda06a
commit 50004931ee
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/init.pp
View File

@@ -1,6 +1,6 @@
# == Class: ssh # == Class: ssh
# #
class ssh { class ssh ($trusted_ssh_source = 'puppetmaster.openstack.org') {
include ssh::params include ssh::params
package { $::ssh::params::package_name: package { $::ssh::params::package_name:
ensure => present, ensure => present,

2
templates/sshd_config.erb
View File

@@ -86,5 +86,5 @@ Subsystem sftp <%= scope.lookupvar('::ssh::params::sftp_path') %>
UsePAM yes UsePAM yes
# allow ansible connections from puppetmaster host # allow ansible connections from puppetmaster host
Match host puppetmaster.openstack.org Match host <%= @trusted_ssh_source %>
PermitRootLogin without-password PermitRootLogin without-password