openstack
/
aodh
Code Issues Proposed changes

remove gnocchiclient cap 

fix remaining usage of recently changed client init interface.
fix req as we don't need it anymore.

Related-Bug: #1714483
Change-Id: I3d7652d294d8082a5ef526d1e51add8056dc3114
This commit is contained in:
gord chung 2017-09-04 17:27:13 +00:00
parent 59355a39ea
commit 3227ae9377
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
aodh/api/controllers/v2/alarm_rules/gnocchi.py
View File

@ -78,9 +78,9 @@ class AlarmGnocchiThresholdRule(base.AlarmRule):
conf = pecan.request.cfg
gnocchi_client = client.Client(
'1', keystone_client.get_session(conf),
interface=conf.service_credentials.interface,
region_name=conf.service_credentials.region_name)
adapter_options={
'interface': conf.service_credentials.interface,
'region_name': conf.service_credentials.region_name})
try:
return gnocchi_client.capabilities.list().get(
'aggregation_methods', [])
@ -182,9 +182,9 @@ class AggregationMetricByResourcesLookupRule(AlarmGnocchiThresholdRule):
gnocchi_client = client.Client(
'1', keystone_client.get_session(conf),
interface=conf.service_credentials.interface,
region_name=conf.service_credentials.region_name)
adapter_options={
'interface': conf.service_credentials.interface,
'region_name': conf.service_credentials.region_name})
try:
gnocchi_client.metric.aggregation(
metrics=rule.metric,

2
requirements.txt
View File

@ -8,7 +8,7 @@ futures>=3.0;python_version=='2.7' or python_version=='2.6' # BSD
futurist>=0.11.0 # Apache-2.0
jsonschema!=2.5.0,<3.0.0,>=2.0.0
keystonemiddleware>=2.2.0
gnocchiclient>=3.1.0,<4.0.0 # Apache-2.0
gnocchiclient>=3.1.0 # Apache-2.0
lxml>=2.3
oslo.db>=4.8.0,!=4.13.1,!=4.13.2,!=4.15.0 # Apache-2.0
oslo.config>=2.6.0 # Apache-2.0