Updated openstack/openstack
Project: openstack/nova  4f8d92a92de0b9b54049be2361b8f49ba5043a2d
null
Revert "Adding image multiple location support"

This reverts commit a55bbbfa1957d02b3006a51afcf4984a1f8ff886.

The series of patches involved with adding this feature introduced
an unexpected dependency on glance's v2 API, which we do not
currently support. Triggering a user-facing bug quickly, and leaving
some uncertainty about what else is likely to come in the future,
a revert of this code was decided given the short time to -rc1.

Closes-bug: 1291014
Change-Id: I2ed6a861e583b9513b0984ff9801d4b9f7536798
Updated openstack/openstack
Project: openstack/heat  5a876d2677e7843facf258761fcce19cafddbe81
null
Retry logic for SSH connection in Cloud Server resource

There is a known issue with some Rackspace Cloud Server images where
they occasionally refuse SSH connections for a few seconds just after
becoming 'ACTIVE'.  This causes the stack creation to fail.

To avoid this, keep trying to initialize the SSH connection for up to 30
TaskRunner cycles.

Closes-Bug: #1287331
Change-Id: Icf28fb3c0de21cf733c4dd0d28a7b653af1bcd0b