Updated from global requirements

Change-Id: I2e274ccce3ed6a143530f2aac4d8817beb44ed5b
Replace sfdisk with parted

Replace the current sfdisk which is broken with parted. This patch is
a short-term fix for the Icehouse RC1 release.

Change-Id: Ifd79f238adfcc242317d0134fc5c1d21873edef2
Closes-Bug: #1297925
Cherry pick oslo rpc HA fixes

Get 2 commits from oslo-rpc fixing HA failover:

* Ia148baa6e1ec632789ac3621c85173c2c16f3918 (fixed HA failover, Qpid part)
* I67923cb024bbd143edc8edccf35b9b400df31eb3 (fixed HA failover, RabbitMQ part)

Change-Id: I8353288560c0c6a9ebe1d143690609765e59df1a
Closes-Bug: #1261631
Fix Nova rescheduling tear down problem

If something fails in the spawn() method (e.g driver parameters, node
in maintenance mode) nova will try to rescheduler the instance (in case
the retry filter is enabled) as part of the rescheduling process nova
will call destroy() on that instance which was cause another problem
when Ironic tried to undeploy a node that wasn't deployed. This patch
is fixing the tear down problem by checking the provision_state of the
node before requesting Ironic to undeploy the node.

Cherry picked from 1b1d6b0cec64311ae62443b8647fd528d3c91f1d

Change-Id: Ic3a502167103e84be041ca1ee06fd17d8140529c
Closes-Bug: #1300288
Merge "Updated from global requirements" into milestone-proposed
Merge "Cherry pick oslo rpc HA fixes" into milestone-proposed
Merge "Fix Nova rescheduling tear down problem" into milestone-proposed
Fix tests with new keystoneclient

A number of changes with keystoneclient breaks our tests. First, a
kwarg changed for cache.set(). It should be 'time' now, not 'timeout'.

Also: keystone middleware now looks for an 'expires' in the token.

Sample conf needed regenerated, also, due to changes.

Closes-bug: 1324655
(cherry picked from commit 6901cbfd7113f770d0b32a99131411fe15dc3d56)

Conflicts:

	etc/ironic/ironic.conf.sample

Change-Id: I33c4f1bae5a3c89b47fd21f8db1b4a4d536ed369
Opening stable/icehouse

Bump version to next stable release on icehouse branch, and set
defaultbranch in .gitreview for convenience.

Change-Id: Ia0ef4afbcb2f324175d3ded7e97f79f5b402ac0b
Updated from global requirements

Change-Id: Iab5eee131a59928346fc584f399617b4b9bdb031
Fix glance endpoint tests

Glance endpoints are now located under http_client after reworking
for glance blueprint common-client-library-2. Change located in
glanceclient commit I5addc38eb2e2dd0be91b566fda7c0d81787ffa75

Test support both glanceclient versions for backward compatibility.

Change-Id: Idba3a05bdb09674b44dcc21c9427b4b85a29a1f7
(cherry picked from commit dac09ad2cd3a65efdd124b6001891428fff9811c)
Updated from global requirements

Change-Id: I74ad0a7c01fd57517db0128b16da6c586b72000c
Add __init__.py for nova scheduler filters

To use these filters out of tree right now, you have to specify them in
nova's available_scheduler filters by full path. But in order for the
modules to be found and loaded, you must have an __init__.py.

Closes-Bug: #1357878
Change-Id: I4816d9dbe0e93056792fad48e6228ffdd531e346
(cherry picked from commit 87aac8823b468a7bb80c994cd207ec5df66163c5)
Do not rely on hash ordering in tests

With tox 1.7.2 hash randomization will be on by default, causing
random failures of our tests. How to reproduce:
* Update tox
* Run something like:
  $ for i in {1..20}; do tox -epy27 || break; done

Closes-bug: #1348818
(cherry picked from commit b056fca27897947ce5ef1326ee19db767f14f0ae)

Conflicts:
	ironic/tests/api/v1/test_drivers.py

NOTE(adam_g):  The following changes had to be tacked on here to get
through the stable/icehouse gate:

    * .testr.conf is also updated to exclude the in-tree Nova
       driver tests, which were never run until Juno and are
       breaking test runs for stable/icehouse.

    * tox.ini is updated to specify PYTHONHASHSEED=0 for doc builds,
      backported from 2abea080f617928af6386074e121aba33db2fe33.

Change-Id: I52c10c47a7a1c0e6a9e436efb090bbcb0fb02edc
Merge "Add __init__.py for nova scheduler filters" into stable/icehouse
Merge "Updated from global requirements" into stable/icehouse
Updated from global requirements

Change-Id: Ic16f67d84ffa4379df4d8cf5d586896178b71003
Updated from global requirements

Change-Id: Ie80ea287ce24b2ecca02463061bac77c1fe78735