diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/puppet/parameter.rb | 1 | ||||
-rwxr-xr-x | lib/puppet/type/sshkey.rb | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/puppet/parameter.rb b/lib/puppet/parameter.rb index c75449e59..78ee4ddf1 100644 --- a/lib/puppet/parameter.rb +++ b/lib/puppet/parameter.rb @@ -183,6 +183,7 @@ module Puppet end def aliasvalue(name, other) + other = symbolize(other) unless @parametervalues.include?(other) raise Puppet::DevError, "Cannot alias nonexistent value %s" % other diff --git a/lib/puppet/type/sshkey.rb b/lib/puppet/type/sshkey.rb index 444b47d35..a9236d057 100755 --- a/lib/puppet/type/sshkey.rb +++ b/lib/puppet/type/sshkey.rb @@ -8,6 +8,11 @@ module Puppet newstate(:type) do desc "The encryption type used. Probably ssh-dss or ssh-rsa." + + newvalue("ssh-dss") + newvalue("ssh-rsa") + aliasvalue(:dsa, "ssh-dss") + aliasvalue(:rsa, "ssh-rsa") end newstate(:key) do |