Bump stable/grizzly next version to 2013.1.2

Change-Id: I130528ae946e8888d35c25e468b4ea6ac29db0cf
Modify limitation on request version

Cherry-picked from 82ad299a5fe893bffbd264f86965ed7a6c4181cf but without
the wrong extras adding.

Signed-off-by: Julien Danjou <julien@danjou.info>

Conflicts:
	tools/pip-requires

Change-Id: I241eb2af55a8f42881476beae7f83ec2fbebdeb7
Pin SQLAlchemy to 0.7.x

0.7.10 has been released and is compatible with 0.7.x. Instead
of pinning to 0.7.9, simply pin to 0.7.x to avoid SQLAlchemy 0.8

Also sync the 0.7.x requirements to 0.7 (to be in sync with other
OpenStack core components)

Fixes: Bug #1153983

Change-Id: Ie20344e96f3d12e93695579adff0a0d9b4c1c516
doc: fix hyphens instead of underscores for 'os*' conf options

The ceilometer documentation, on the configuration page,
list some options with hyphens (e.g. 'os-tenant-id') which are unknown options:
underscores are required instead (e.g.: 'os_tenant_id').

Fixes: bug #1177002
Change-Id: Iea9c53f628df0b3bed06206e9b2241ed949131fa
Cherry picked from https://review.openstack.org/#/c/30725/
Don't use pecan to configure logging

Fixes bug #1184941

openstack.common.log gives a mechanism to configure logging and, by
default, we will set up a handler on root logger. Using pecan to also
configure a handler on the 'ironic' logger means every log message gets
logged to console twice.

It seems that the pecan logging configuration stuff is redundant with
our existing logging configuration infrastructure.

Change-Id: Iec0630b0e842e3b6a90021bf552d9b857c5a0552
(cherry picked from commit e6a083fc5acb6f3ad03cc1df0943e4e746629128)
ImagePollster record duplicate counter during one poll

When using ImagePollster to poll image status from Glance, there might
be duplicate image status event recorded down if there are private
images together with public images stored in Glance.

In Glance, the get image list API looks like:
    def _get_images(self, context, filters, **params):
        ...
 # NOTE(markwash): for backwards compatibility, is_public=True for
 # admins actually means "treat me as if I'm not an admin and show
 # all my images"
        if context.is_admin and params.get('is_public') is True:
            context.is_admin = False
            del params['is_public']
        ...
The above code shows that if a user is of 'admin_role'(this option is
configured in the glance-api.conf)  and querying for public images,
Glance will return all the public images together with the private
ones

While in ceilometer/image/glance.py#_Base.iter_images method,
ceilometer get the image list by querying public and private images
respectively and then chain the result lists together. This causes
the duplication of image in the image list.

This fix changes the code in ImagePollster.get_counters method to
filter out the duplicate images based on their image id.

Change-Id: Ib5e213161043033c20195efc0c6e7edd78982bd6
Fixes: Bug 1180630
(cherry picked from commit dfcd0dd7c4dad64b282843f681213b335ab735f4)
vnics: don't presume existence of filterref/filter

With quantum/ovs plugin, there is no necessarily a "filteref" in interface param.
If not present don't lookup the "filter", let it to None and no more use
vnics.fref as resource_id.
resource_id becomes : instance_name + instance_uuid + vnic_name

fix Bug #1180466

Change-Id: I21c15f9ee4bd5303a7f2e287c7fe69aa7d0d5b0a
(cherry picked from commit f5d82ac17c0f8dfaed92670649c4bed0794dacf6)
fix compute units in measurement doc

related to bug#1165123 and patch (https://review.openstack.org/#/c/26462)

memory: B to MB
disk.root.size: B to GB
disk.ephemeral.size: B to GB

Change-Id: I59599c2cb7df02acc0d4349a8591a2c1bda4f9ec
(cherry picked from commit b101e0f6d91c391de4ae54080ee9e73465051543)
Restore default interval

As we switched to multi-publisher pipelining, we modified,
I believe by mistake, the default polling interval from 600
to 60 second.

Change-Id: I4192a52aab1cbb744cd7ddf212e5ed3b0a3a27e6
Fixes: bug #1181153
(cherry picked from commit c48284bdd4bcaac975f98b8f0ff89f059a910480)
Document keystone_authtoken section

It's necessary to document how to configure the keystone_authtoken
section in the ceilometer.conf file so clients can authenticate
against the API server.

Fixes bug: 1177765

Change-Id: I93b45a7e65546246bbf1af795be5887e9a80c1fa
(cherry picked from commit c043106309415d7540c22f80eae9963927cd7f6c)
fix the broken ceilometer.conf.sample link

Change-Id: I37ce2b1e10019e5a77217d458113155a26a2c59f
Fixes: bug #1177332
(cherry picked from commit 1d4533e915a2d812af19d61937916b882d1f7da1)
Document HBase configuration

The instructions to configure HBase as the database backend for Ceilometer

Change-Id: I3c79e68db7226531d77037bc93ca2cca3ef7db28
Fixes: bug #1174326
(cherry picked from commit 018e39df1a549986f2c2cb241614e3c4e93650cd)
Merge "Document keystone_authtoken section" into stable/grizzly
Merge "Restore default interval" into stable/grizzly
Merge "Document HBase configuration" into stable/grizzly
Merge "fix compute units in measurement doc" into stable/grizzly
Merge "vnics: don't presume existence of filterref/filter" into stable/grizzly
Merge "ImagePollster record duplicate counter during one poll" into stable/grizzly
Merge "Don't use pecan to configure logging" into stable/grizzly
sql: fix 003 downgrade

I guess nobody ever had to use it, but the SQL query built isn't used
currently.

Fixes: bug #1186263

Change-Id: I81437beb65775d412ff1433617ee64eda6d6af61
Signed-off-by: Julien Danjou <julien@danjou.info>