Changed key_pair to keypair, as per the DSL #178

Merged
merged 4 commits into from Oct 1, 2012

Conversation

Projects
None yet
2 participants
Owner

mrflip commented Sep 30, 2012

The DSL has always used 'keypair' not 'key_pair'. The only touchpoints to key_pair were internal. With a facade in place, there's no reason to go with Fog's opinion over our own DSL's. There's another latent issue, which is that these are variously then known as 'identity_file', 'ssh_identity_file', 'key_filename', and 'ssh_key_name'. The next patch will address the ssh/proxy issues; I'll see what I can do there.

This patch makes ironfan use keypair uniformly.

If we are going with anything but keypair, I'd prefer 'ssh_key_name', or something makes sense across providers. In all respects I'd like it to be uniform internally.

(only 918150c is relevant to this PR -- I don't want to try to rebase through a commit.)

Philip (flip) Kromer and others added some commits Sep 30, 2012

Philip (flip) Kromer Terminated machines are not bogus
The dead are not bogus (Bill & Ted I), they're ghosts (Bill & Ted II)

* terminated machines are skipped, as they were in old ironfan.
* ...except in the case of knife cluster show, which accepts them as there-but-bogus if verbosity > 1.
4f967c3
Philip (flip) Kromer Changed key_pair to keypair, as per the DSL
The DSL has always used 'keypair' not 'key_pair'. The only touchpoints to key_pair were internal.

With a facade in place, there's no reason to go with Fog's opinion over our own DSL's. This patch makes ironfan use 'keypair' uniformly.
918150c
Philip (flip) Kromer Ignore deleting, deleted, or errored volumes in discovery 22832d8
@temujin9 temujin9 Merge branch 'master' into keypair_not_key_pair e890aa1

@temujin9 temujin9 merged commit e890aa1 into master Oct 1, 2012

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment