diff options
author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-01-04 06:29:14 +0000 |
---|---|---|
committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-01-04 06:29:14 +0000 |
commit | 098081d88fe17b221bad00c17ccff42324823a7a (patch) | |
tree | 8622a12cdab3f2e291fa92c04fc23a44a6069f3e /lib | |
parent | 5292e4eb4dd57c0db3f2ab216216f9e21301f53b (diff) | |
download | puppet-098081d88fe17b221bad00c17ccff42324823a7a.tar.gz puppet-098081d88fe17b221bad00c17ccff42324823a7a.tar.xz puppet-098081d88fe17b221bad00c17ccff42324823a7a.zip |
Setting up specific allowed types for sshkey
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2033 980ebf18-57e1-0310-9a29-db15c13687c0
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 |