Updated openstack/openstack
Project: openstack/python-troveclient  13d8666862b271600bc50fa4466e62f68cf251d3

Overwrite HelpFormatter constructur to extend argument column

Overwrite the HelpFormatter constructor in the class
OpenStackHelpFormatter to modify the default value of the
max_help_position to extend the width of the argument column
in the help output.

example output before this patch:

    configuration-attach
                        Attaches a configuration group to an instance.
    configuration-create
                        Creates a configuration group.
    configuration-default
                        Shows the default configuration of an instance.
    configuration-delete
                        Deletes a configuration group.
    configuration-detach
                        Detaches a configuration group from an instance.

example output after this patch:

    configuration-attach          Attaches a configuration group to an
                                  instance.
    configuration-create          Creates a configuration group.
    configuration-default         Shows the default configuration of an
                                  instance.
    configuration-delete          Deletes a configuration group.
    configuration-detach          Detaches a configuration group from an
                                  instance.

Change-Id: Ia3ad8e9fefca6da40f55ab3de902c015a0d17006
Closes-Bug: #1326471
Updated openstack/openstack
Project: openstack/cinder  04eecfc7542e7f314c747b01c2715876d484dbb5

Handle volumes no longer existing in resume delete

init_host resumes deletes for volumes with a status of 'deleting'. It
does these sequentially, and sometimes a volume could be deleted under
it, causing a bad stacktrace. This will gracefully handle those
situations and move on. Added coverage for resume volume delete being
successful as well.

Change-Id: I5b30265609b65804f2da77d9daa84b640de7939c
Closes-Bug: #1322340