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

2015-04-16 23:15:07 +00:00 · 2015-04-16 23:15:07 +00:00 · 2c0d37d973
commit 2c0d37d973
parent 336e301e5c 66396c5a52
1 changed files with 4 additions and 1 deletions
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@ -23,12 +23,15 @@ class openstack_project::template (

  include ntp
  include snmpd
-  include ssh
  include sudoers

  include openstack_project::params
  include openstack_project::users

+  class { 'ssh':
+    trusted_ssh_source => $puppetmaster_server,
+  }
+
  class { 'iptables':
    public_tcp_ports => $iptables_public_tcp_ports,
    public_udp_ports => $all_udp,