Merge "Add an optional extra node admin ssh key parameter"
authorJenkins <jenkins@review.openstack.org>
Mon, 7 Nov 2016 14:12:20 +0000 (14:12 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 7 Nov 2016 14:12:20 +0000 (14:12 +0000)

Trivial merge