v3.2.0-rc3: Merge pull request #1236 from thatmidwesterncoder/backport_7527894
Pre-release
Pre-release
[Backport release/v3] Revert "Remove OpenStack keypair_name references"
[Backport release/v3] Revert "Remove OpenStack keypair_name references"