Merge "Create short lived ssh key for enable-ssh-admin.sh" into stable/pike
authorZuul <zuul@review.openstack.org>
Tue, 24 Oct 2017 19:46:07 +0000 (19:46 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 24 Oct 2017 19:46:07 +0000 (19:46 +0000)

Trivial merge