Change-Id: I134bcbece0f28bf5234f0afd8349b602ce2940a1
(cherry picked from commit 51b54d54)

Hosts that weren't part of the overcloud group would be included in the
list when this is run without a limit.

Closes-Bug: #2091621
Change-Id: Id3d68b55e18dfe9c44805b6e2602e00eadecc76a
(cherry picked from commit f27755ae)