aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-02-09 11:09:41 +0000
committerMichael Scherer <misc@mageia.org>2012-02-09 11:09:41 +0000
commit243c4df254610fee26105ac6e16950f132c2d30d (patch)
tree1b4a46ea825f97a21a1d6363da834934a5d28345
parent3d1b2d1d745bcb34331fe5ebc96ba34bf59afac1 (diff)
downloadpuppet-243c4df254610fee26105ac6e16950f132c2d30d.tar
puppet-243c4df254610fee26105ac6e16950f132c2d30d.tar.gz
puppet-243c4df254610fee26105ac6e16950f132c2d30d.tar.bz2
puppet-243c4df254610fee26105ac6e16950f132c2d30d.tar.xz
puppet-243c4df254610fee26105ac6e16950f132c2d30d.zip
shorter version of the sshkeys collect, and also remove tabs
-rw-r--r--deployment/common/manifests/init.pp14
1 files changed, 2 insertions, 12 deletions
diff --git a/deployment/common/manifests/init.pp b/deployment/common/manifests/init.pp
index 7929519a..bb815bfe 100644
--- a/deployment/common/manifests/init.pp
+++ b/deployment/common/manifests/init.pp
@@ -15,24 +15,14 @@ class common {
}
class export_ssh_keys {
- @@sshkey { "$hostname":
- type => rsa,
- key => $sshrsakey
- }
-
- @@sshkey { "$fqdn":
+ @@sshkey { ["$hostname","$fqdn","$ipaddress"]:
type => rsa,
key => $sshrsakey
}
-
- @@sshkey { "$ipaddress":
- type => rsa,
- key => $sshrsakey
- }
}
class import_ssh_keys {
- Sshkey <<| |>>
+ Sshkey <<| |>>
}
class default_ssh_root_key {