Merge "Use "$puppetmaster_server" as parameter to the ssh class"

This commit is contained in:
Jenkins 2015-04-16 23:15:07 +00:00 committed by Gerrit Code Review
commit 2c0d37d973

View File

@ -23,12 +23,15 @@ class openstack_project::template (
include ntp include ntp
include snmpd include snmpd
include ssh
include sudoers include sudoers
include openstack_project::params include openstack_project::params
include openstack_project::users include openstack_project::users
class { 'ssh':
trusted_ssh_source => $puppetmaster_server,
}
class { 'iptables': class { 'iptables':
public_tcp_ports => $iptables_public_tcp_ports, public_tcp_ports => $iptables_public_tcp_ports,
public_udp_ports => $all_udp, public_udp_ports => $all_udp,