Develop #974

Merged
merged 3 commits into from Mar 20, 2012

2 participants

@trane

This is tested on master/minion for add/remove ssh_auth with options. It adds 're' to the ssh module, perhaps you don't want that. All I have done is separated they key into two possible states "{options} key" where options is 0 or more options.

trane added some commits Mar 20, 2012
@trane trane Refactor ssh verify line to smartly parse extra options
Lines in an ssh auth key can begin like this:
tunnel="1",command="sh /etc/netstart tun1" ssh-rsa
Need to separate the parsing of options from the key. This patch groups the ssh
auth key line into two parts, [{options}* key]
2d9b2ba
@trane trane Add second param to search()
Somehow forgot this from the transition from dev branch to develop
ae8d2a3
@trane trane Remove redudant options check
Now that we are handling option parsing separately, no need for the option check
15a3a12
@thatch45 thatch45 merged commit 28ea48b into saltstack:develop Mar 20, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment