This has no impact on the end result, but it should make fixing issues
introduced by API microversion 2.69 a little easier.
Conflicts:
openstackclient/compute/v2/server.py
NOTE(melwitt): The conflict is because change
I9c62cf6fe23b2e934dcbf5ebbf706b2705d2e424 (Show words indicating booted
from volume for server image) is not in Ussuri.
Change-Id: I7d70eac8aa1a6197ed05a49f071e6899ec219c03
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
(cherry picked from commit 4c3de28e83)
(cherry picked from commit f4adbcef7b)
(cherry picked from commit cb621f22d4)
(cherry picked from commit 3c280727e7)
03859c6c68