Bump stable/grizzly next version to 2013.1.3

Change-Id: Ia722f594374835199ebc5303c70489e966a27972
Allow use of local conductor

Fixes bug 1204864

Conductor API import was directly importing remote API not allowing
use of use_local flag in nova.

Change-Id: Ieea410ac6b90fedb6871e0f4c3d02e6a35363439
(cherry picked from commit c6a2daeab5ca6988b7565092516f39916a360445)
add metadata to nova_client results

Fixes bug 1190547

Conflicts:

	tests/compute/test_instance.py

Change-Id: I90861038f0623e6183dfd43899669aba88b47796
(Cherry-picked from commit 298e2f7e7b7074f1b6dab8175fa19bc456f4a0c4)
fix resource_metadata failure missing image data

When image metadata is missing kernel and ramdisk causes exception.

Fixes bug 1197180

(cherry picked from commit 298e2f7e7b7074f1b6dab8175fa19bc456f4a0c4)
Change-Id: Iefb3ac8e92c273ddfff28fe848d2e7b0e6406321
Add index for db.meter by descending timestamp

Fixes bug #1193906

Added an index for db.meter to sort by descending time stamp for class
Connection in ceilometer/storage/impl_mongodb.py

ensure_index() is used rather than create_index() to be more efficient.

This index is needed because get_samples() in
ceilometer/storage/impl_mongodb.py sorts by descending timestamp.  Without an
index, MongoDB will fail to sort if the database is too large.

Change-Id: I23070f153ce03a8d6d8c9f17f05e2d5dae38647e
(cherry picked from commit e984f28b00e3a073c176f6435507f5bce1c82d30)
Lose weight for Ceilometer log in verbose mode

When setting verbose=True, the log level will be set to INFO, so we
just change the LOG method from info to debug in places where produce
heavily output.

If want to get debug level logs, set debug=True in ceilometer.conf.

Change-Id: I06e1f06340a2e7b782d3c7461ea86b629dadf05d
Fixes: bug 1192170
(cherry picked from commit 6cf57af498b1ef30c76d4a98c3266c9d191ae16f)
Fix the argument of UnknownArgument exception

This change sets the real UnknownArgument instead of the last
valid one in the exception raised by the API.

Fixes bug #1201839

Change-Id: I22e1dadbe9a90e03e8ccfbcc6e0e8dc3f17c5a3e
(cherry picked from commit 384617f6ca98723cd9c1ad66d74c4cb827fdf42c)
Merge "Lose weight for Ceilometer log in verbose mode" into stable/grizzly
Merge "Add index for db.meter by descending timestamp" into stable/grizzly
Merge "Fix the argument of UnknownArgument exception" into stable/grizzly
Use correct hostname to get instances.

socket.getfqdn() would return a fully qualified domain name
which maybe invalid for nova to get instances by hostname.
If the host that runs devstack is virtual(like running
devstack on AWS), socket.getfqdn() may return a domain name
which is not the host name and nova cannot use that to get
instances running on current host.

Fix bug: #1166717

Change-Id: Ic6cc8607bcdeee720c5d46d44fbaa589b4fb950e
(cherry picked from commit 16f8e14b24006b23e1965329fa27ab7fcab3e6de)
doc: be more explicit about network counters

Change-Id: Ia42cc840dd977aff51767ddc576cfd6c1ed545b2
Fixes: bug#1187943
(cherry picked from commit 71ac3a5c9030e1d16e67c87024972cbbbfee45ab)
Allow to specify the endpoint type to use

Not everybody will want to use publicURL, so let's make this configurable.

Change-Id: Ice85a8ef1083580d89285e83239de872939665af
Fixes: bug#1188469
(cherry picked from commit e541fcb0d47e0beb447fb1a3ce1d62881fa382f8)
Merge "Use correct hostname to get instances." into stable/grizzly
Merge "doc: be more explicit about network counters" into stable/grizzly
Merge "Allow to specify the endpoint type to use" into stable/grizzly
Fix return error when resource can't be found

By current implement, the HTTP request for /v2/resources/<resource_id>
will return 500 if there is no coresponding resource or the resource id
is invalid. And the response is as below:

{"error_message": "{"debuginfo": null, "faultcode": "Server",
"faultstring": "list index out of range"}"}

After fixed, the response will be like this:

{"error_message": "{"debuginfo": null, "faultcode": "Client",
"faultstring": "Invalid input for field/attribute resource_id.
Value: '9'. Unknown resource"}"}

Fixes bug: 1195925

Change-Id: I73c73fb3ba57bc6cbbf421f9ac5ec3cdb68ce784
(cherry picked from commit fbb1eb9285c7787f8508d3f69790522ff6847fc8)
Merge "Fix return error when resource can't be found" into stable/grizzly
Merge branch 'grizzly', tag '2013.1.3' into grizzly

2013.1.3