diff --git a/aodh/api/controllers/v2/alarm_rules/gnocchi.py b/aodh/api/controllers/v2/alarm_rules/gnocchi.py index 388850344..818addd0d 100644 --- a/aodh/api/controllers/v2/alarm_rules/gnocchi.py +++ b/aodh/api/controllers/v2/alarm_rules/gnocchi.py @@ -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, diff --git a/requirements.txt b/requirements.txt index 812eac215..7c2f077f4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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