Merge "Handle deleted instance types." into grizzly/1.3
Merge 'OS-249: Create base disks for ephemeral disks' into grizzly/1.4

Conflicts:
	.gitreview

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

Conflicts:
	cobalt/nova/api.py

Change-Id: Ib91bb20b7560c074c7ba2020b4a9d34abeeec343
Allowing networks to be specified at launch in the dashboard

OS-252

Adds support for specifying the networks to attach to the launched
instance in the dashboard. Note: similar to the boot workflow, a
network must be specified when using the dashboard. This also only
applies when Quantum/Neutron is used for networking.

Change-Id: I5f4dec4d7baf25de6ff697d6829d5efab4f6a2f7
Merge "Allowing networks to be specified at launch in the dashboard" into grizzly/1.4
Empty merge to harmonize grizzly/1.3 with grizzly/1.4

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

Conflicts:
	cobalt/nova/extension/manager.py

Change-Id: Idfbbe79406e45e3ad4ac4bd7b8037835cbf12fcd
Merge 'Networks specified at launch time (OS-252)' into havana/1.4

Change-Id: Ide6f2f647fd96dee2564c75540695902c56fc00b
Merge 'Specify networks in dashboard for launch (OS-252)' into havana/1.4

Conflicts:
	.gitreview
	cobalt/nova/api.py

Change-Id: If49133ed95f682718acc56708e84affca7fb1b7a
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 'OS-249: Create base disks for ephemeral disks' into grizzly/1.5

Conflicts:
	.gitreview

Change-Id: I36fec6bf135db07851428b4e4324ba271492e996
Exclusively use fully-loaded instance objects

Fixes OS-261

Ensure that only instance objects are used throughout the manager
and renamed "instance_ref" to "instance" to help reflect this.
This ensure that cobalt uses a consistent type throughout.

When passing an instance object through an RPC call it will get
serialized into a dictionary format. Any fields that were not
loaded will not be present in serialized dictionary. This will
cause errors when the RPC method expects the data to exists.

When loading the intial instance object we explicit ask for all of
the default fields to also be loaded (e.g. metadata). In this way
we do not need to worry about what fields are loaded before making
an RPC request.

Change-Id: I3e8c8bb107c3a9f737543ff979631eb30a4a171a
Use instance_type information stored in instance's system_metadata

Fixes OS-250

The instance_type/flavor is not a reliable source of information
because it can be deleted after an instance has been created from
it. However, all of the instance_type/flavor information is stored
in an instance's system_metadata. The core nova-compute process
uses the system_metadata to reconstruct the instance_type/flavor
when required.

Now cobalt-compute also uses the instance's system_metadata.

Change-Id: I541aa30b845cb1e752e439ec267bc89dbe55d9e6
Merge 'Use flavor information stored in system_metadata (OS-250)' into havana/1.4

Conflicts:
	bin/cobalt-compute
	cobalt/nova/api.py
	cobalt/tests/test_manager.py
	cobalt/tests/utils.py

Change-Id: I57f5a94cd9327b3263af44f55486c81a60c07ba8
Merge branch 'havana/1.4' into havana/1.5

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

Change-Id: Idd3f87b5b38c67ea121a99d899fa644163337f70