Pulls in some fixes from master that address new issues that recently
started affecting our gate jobs.
Includes:
Fix bugs in functional tests
- Dont cache management address of appliances
- Wait for nova instance status==active before asserting router status
- Wait a full config_timeout (600s) for rebuild
- Also look for ha router interfaces when cleaning up
Change-Id: I69341c6abee4e36b10f8e9b676587babe861f0c0
And:
devstack: Bump alive_timeout
Bump alive timeout to 60s to deal with slow qemu instances.
Also, give astara more time to recover from a degraded cluster. This
can be slow to recover when a slow qemu node is waiting on a long-running
config update.
Change-Id: I491b96c43d898f7a961725e4f5720af7b9547038