Merge 'Networks specified at launch time (OS-252)' into grizzly/1.5

Conflicts:
	cobalt/nova/extension/manager.py

Change-Id: Idfbbe79406e45e3ad4ac4bd7b8037835cbf12fcd
Merge 'Ephemeral base disk creation (OS-249)' into grizzly/1.5

Change-Id: I5151ed976b50a051b9a2c8816312950779e7ae35
Merge 'Handle deleted instance types (OS-250)' into grizzly/1.5

Change-Id: Ib5e005b3a6fe9b76f9f610bae07906994fda4fa7
avoid spurious error if no logical volumes exist

When a volume group is empty, /dev/$VOLUME_GROUP_NAME doesn't exist and
cobalt-compute's periodic task's call to os.listdir(/dev/$VOLUME_GROUP_NAME)
raises an exception.

Fixes OS-260.

Change-Id: I44840d4102df75e0e769676466771ade170a6e85
Merge "Merge 'Handle deleted instance types (OS-250)' into grizzly/1.5" into grizzly/1.5
Merge "Allowing networks to be specified at launch in the dashboard (OS-252)" into grizzly/1.5

Change-Id: I085b5430d714bbc8dcd806b9fcb72f7a66a79935
Merge 'Handle deleted instance types (grizzly/1.3-merge)' into grizzly/1.5

Change-Id: Ie8db619a7daf5c8e5d258e5a1fc4060a52f1779f
Merge "Merge "Allowing networks to be specified at launch in the dashboard (OS-252)" into grizzly/1.5" into grizzly/1.5
Merge 'system metadata instance type information (OS-250)' into grizzly/1.5

Conflicts:
	cobalt/nova/extension/manager.py

Change-Id: I6f4daaa9fa6bece0ee907d6ba8a0be932e640bad
Instance should only become 'ACTIVE' after migration completes

OS-268

An instance's task_state should only switch from 'migrating' to None
after migration completes.

Change-Id: I503953806afe242e6fb73514080c731c9f6ed2d3
Merge commit 'Become 'ACTIVE' AFTER migration completes (OS-268)' into havana/1.4

Conflicts:
	cobalt/nova/extension/manager.py

Change-Id: I5da1121eaaf7aaa2c1a1c615b0d1a5eef95ec772
Support Havana volume API changes

OS-262

Havana changed their internal volume API to accept the volume_id
instead of the volume object. Cobalt needed to be updated to pass
in the volume_id instead of the volume, and the additional API call
to retrieve the volume was no longer needed.

The snapshot 'source_type', a new Havana block_device_mapping field,
also needed to be applied to the created snapshot. This field is use
when launching the instance to indicate that a new volume should be
created for the launched instance.

Change-Id: I3113b399f9ece4a22096481892960efddb17e74b
ERORR if migration rollback fails

Fixes OS-196.

Change-Id: Ie6c8bb85afdd58815bc4ed1ea0b659a4ac38c5c7
OS-270: hooks framework.

Configurable via cobalt_enable_action_hooks.

Change-Id: I4f747cccdb8ce8429b0557f8803f542e3e41ff58
Merge remote-tracking branch 'origin/grizzly/1.4' into grizzly15

Conflicts fixed:
	cobalt/nova/extension/manager.py

Change-Id: Ifb3f6ab6e653c15a9cf5aeeaa7d8ad3e6fb19253
Merge remote-tracking branch 'origin/havana/1.4' into havana15

Conflicts fixed:
	cobalt/nova/extension/manager.py

Change-Id: I11341f2b08288370b179bfabbcc0104ea0f610b7
Merge remote-tracking branch 'origin/grizzly/1.5' into havana15_2

Conflicts fixed:
	cobalt/nova/extension/manager.py

Also fixed s/instance_ref/instance/ for all hooks calls (hooks i.e. OS-270
pulled in through merge).

Change-Id: I61fdb85724768d45a67f469ebbaecd44ef5d6148