fix alarm interface

this commit is a backport of upstream commit
a5462e6623
This modification updates the code to properly propagate
the user selection for interface type and region name

Depends-On: https://review.openstack.org/#/c/611669/
Closes-bug: #1797414

Change-Id: I8620074f76766a1e2a6446d78c99d195de943024
Signed-off-by: Paul-Emile Element <Paul-Emile.Element@windriver.com>
This commit is contained in:
Paul-Emile Element 2018-10-18 12:13:03 -04:00
parent 92225e537f
commit 44d0507491
6 changed files with 40 additions and 0 deletions

View File

@ -10,6 +10,7 @@ openstack/openstack-magnum-ui
openstack/openstack-ras
openstack/openstack-panko
openstack/openstack-os-vif
openstack/python-aodhclient
openstack/python-ceilometer
openstack/python-ceilometerclient
openstack/python-cinder

View File

@ -0,0 +1 @@
TIS_PATCH_VER=1

View File

@ -0,0 +1,21 @@
diff --git a/SPECS/python-aodhclient.spec b/SPECS/python-aodhclient.spec
index 5d60fe2..ec5afaa 100644
--- a/SPECS/python-aodhclient.spec
+++ b/SPECS/python-aodhclient.spec
@@ -8,13 +8,15 @@
Name: python-aodhclient
Version: 0.9.0
-Release: 1%{?dist}
+Release: 1%{?_tis_dist}.%{tis_patch_ver}
Summary: Python API and CLI for OpenStack Aodh
License: ASL 2.0
URL: https://launchpad.net/python-aodhclient
Source0: https://tarballs.openstack.org/%{name}/%{pypi_name}-%{upstream_version}.tar.gz
+Patch0: 0001-fix-interface.patch
+
BuildArch: noarch
%description

View File

@ -0,0 +1 @@
0001-spec.patch

View File

@ -0,0 +1,15 @@
diff --git a/aodhclient/osc.py b/aodhclient/osc.py
index 1e8599f..a1ecfee 100644
--- a/aodhclient/osc.py
+++ b/aodhclient/osc.py
@@ -39,7 +39,9 @@ def make_client(instance):
API_VERSIONS)
# NOTE(sileht): ensure setup of the session is done
instance.setup_auth()
- return aodh_client(session=instance.session)
+ return aodh_client(session=instance.session,
+ interface=instance.interface,
+ region_name=instance.region_name)
def build_option_parser(parser):

View File

@ -0,0 +1 @@
mirror:Source/python-aodhclient-0.9.0-1.el7.src.rpm