Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package fence-agents for openSUSE:Factory checked in at 2021-02-11 12:49:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fence-agents (Old) and /work/SRC/openSUSE:Factory/.fence-agents.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fence-agents" Thu Feb 11 12:49:39 2021 rev:51 rq:871067 version:4.7.1+git.1612974063.9e01fc92 Changes: -------- --- /work/SRC/openSUSE:Factory/fence-agents/fence-agents.changes 2021-02-10 21:30:40.914310052 +0100 +++ /work/SRC/openSUSE:Factory/.fence-agents.new.28504/fence-agents.changes 2021-02-11 12:52:55.337962742 +0100 @@ -1,0 +2,18 @@ +Wed Feb 10 20:25:29 UTC 2021 - tr...@suse.de + +- Update to version 4.7.1+git.1612974063.9e01fc92: + * fence_gce: Adds cloud-platform scope for bare metal API and optional proxy flags (#382) + +------------------------------------------------------------------- +Wed Feb 10 13:33:34 UTC 2021 - tr...@suse.de + +- Update to version 4.7.1+git.1612946165.05fa9b4e: + * fence_gce: update module reqs for SLES 15 (#383) + * fence_redfish: Add diag action +- Fixed by previous versions already, but for the records... + These sources include fixes for these bugs: + bsc#1169485 (git commit 020f48a309bcad659dc493960d2b39e8e1243085) + bsc#1169852 (git commit 5c182c4018728e3cdcc6846d74d373cc5b0639dd) + bsc#1178343 (git commit 877be689d75892fe069154cf3bc02909f3edaf50) + +------------------------------------------------------------------- Old: ---- fence-agents-4.7.0+git.1612425309.e4f51e44.tar.xz New: ---- fence-agents-4.7.1+git.1612974063.9e01fc92.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fence-agents.spec ++++++ --- /var/tmp/diff_new_pack.KAY2in/_old 2021-02-11 12:52:55.873963480 +0100 +++ /var/tmp/diff_new_pack.KAY2in/_new 2021-02-11 12:52:55.873963480 +0100 @@ -29,7 +29,7 @@ Summary: Fence Agents for High Availability License: GPL-2.0-only AND LGPL-2.1-only Group: Productivity/Clustering/HA -Version: 4.7.0+git.1612425309.e4f51e44 +Version: 4.7.1+git.1612974063.9e01fc92 Release: 0 URL: https://github.com/ClusterLabs/fence-agents Source0: %{name}-%{version}.tar.xz ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.KAY2in/_old 2021-02-11 12:52:55.913963535 +0100 +++ /var/tmp/diff_new_pack.KAY2in/_new 2021-02-11 12:52:55.917963541 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/ClusterLabs/fence-agents.git</param> - <param name="changesrevision">08a4521f9361c7ca4877e691fa82cc0e8f51d707</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">9e01fc92c918dd6a57f865e54912fdd97aba28b5</param></service></servicedata> \ No newline at end of file ++++++ fence-agents-4.7.0+git.1612425309.e4f51e44.tar.xz -> fence-agents-4.7.1+git.1612974063.9e01fc92.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.7.0+git.1612425309.e4f51e44/agents/gce/fence_gce.py new/fence-agents-4.7.1+git.1612974063.9e01fc92/agents/gce/fence_gce.py --- old/fence-agents-4.7.0+git.1612425309.e4f51e44/agents/gce/fence_gce.py 2021-02-04 08:55:09.000000000 +0100 +++ new/fence-agents-4.7.1+git.1612974063.9e01fc92/agents/gce/fence_gce.py 2021-02-10 17:21:03.000000000 +0100 @@ -5,10 +5,11 @@ # RHEL 7.x: google-api-python-client==1.6.7 python-gflags==2.0 pyasn1==0.4.8 rsa==3.4.2 # RHEL 8.x: nothing additional needed # SLES 12.x: python-google-api-python-client python-oauth2client python-oauth2client-gce -# SLES 15.x: python3-google-api-python-client python3-oauth2client +# SLES 15.x: python3-google-api-python-client python3-oauth2client python3-oauth2client-gce # import atexit +import httplib2 import logging import json import re @@ -16,6 +17,7 @@ import socket import sys import time + if sys.version_info >= (3, 0): # Python 3 imports. import urllib.parse as urlparse @@ -31,6 +33,7 @@ import googleapiclient.discovery from oauth2client.client import GoogleCredentials from oauth2client.service_account import ServiceAccountCredentials + import socks except: pass @@ -320,6 +323,23 @@ "required" : "0", "order" : 9 } + all_opt["proxyhost"] = { + "getopt" : ":", + "longopt" : "proxyhost", + "help" : "--proxyhost=[proxy_host] The proxy host to use, if one is needed to access the internet (Example: 10.122.0.33)", + "shortdesc" : "If a proxy is used for internet access, the proxy host should be specified.", + "required" : "0", + "order" : 10 + } + all_opt["proxyport"] = { + "getopt" : ":", + "type" : "integer", + "longopt" : "proxyport", + "help" : "--proxyport=[proxy_port] The proxy port to use, if one is needed to access the internet (Example: 3127)", + "shortdesc" : "If a proxy is used for internet access, the proxy port should be specified.", + "required" : "0", + "order" : 11 + } def main(): @@ -327,7 +347,7 @@ device_opt = ["port", "no_password", "zone", "project", "stackdriver-logging", "method", "baremetalsolution", "apitimeout", "retries", "retrysleep", - "serviceaccount"] + "serviceaccount", "proxyhost", "proxyport"] atexit.register(atexit_handler) @@ -377,13 +397,24 @@ # Prepare cli try: if options.get("--serviceaccount"): - credentials = ServiceAccountCredentials.from_json_keyfile_name(options.get("--serviceaccount")) + scope = ['https://www.googleapis.com/auth/cloud-platform'] + credentials = ServiceAccountCredentials.from_json_keyfile_name(options.get("--serviceaccount"), scope) logging.debug("using credentials from service account") else: credentials = GoogleCredentials.get_application_default() logging.debug("using application default credentials") - conn = googleapiclient.discovery.build( - 'compute', 'v1', credentials=credentials, cache_discovery=False) + + if options.get("--proxyhost") and options.get("--proxyport"): + proxy_info = httplib2.ProxyInfo( + proxy_type=socks.PROXY_TYPE_HTTP, + proxy_host=options.get("--proxyhost"), + proxy_port=int(options.get("--proxyport"))) + http = credentials.authorize(httplib2.Http(proxy_info=proxy_info)) + conn = googleapiclient.discovery.build( + 'compute', 'v1', http=http, cache_discovery=False) + else: + conn = googleapiclient.discovery.build( + 'compute', 'v1', credentials=credentials, cache_discovery=False) except Exception as err: fail_usage("Failed: Create GCE compute v1 connection: {}".format(str(err))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.7.0+git.1612425309.e4f51e44/agents/redfish/fence_redfish.py new/fence-agents-4.7.1+git.1612974063.9e01fc92/agents/redfish/fence_redfish.py --- old/fence-agents-4.7.0+git.1612425309.e4f51e44/agents/redfish/fence_redfish.py 2021-02-04 08:55:09.000000000 +0100 +++ new/fence-agents-4.7.1+git.1612974063.9e01fc92/agents/redfish/fence_redfish.py 2021-02-10 17:21:03.000000000 +0100 @@ -40,7 +40,8 @@ action = { 'on' : "On", 'off': "ForceOff", - 'reboot': "ForceRestart" + 'reboot': "ForceRestart", + 'diag': "Nmi" }[options["--action"]] payload = {'ResetType': action} @@ -119,7 +120,8 @@ def main(): atexit.register(atexit_handler) - device_opt = ["ipaddr", "login", "passwd", "redfish-uri", "systems-uri", "ssl"] + device_opt = ["ipaddr", "login", "passwd", "redfish-uri", "systems-uri", + "ssl", "diag"] define_new_opts() opt = process_input(device_opt) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.7.0+git.1612425309.e4f51e44/tests/data/metadata/fence_gce.xml new/fence-agents-4.7.1+git.1612974063.9e01fc92/tests/data/metadata/fence_gce.xml --- old/fence-agents-4.7.0+git.1612425309.e4f51e44/tests/data/metadata/fence_gce.xml 2021-02-04 08:55:09.000000000 +0100 +++ new/fence-agents-4.7.1+git.1612974063.9e01fc92/tests/data/metadata/fence_gce.xml 2021-02-10 17:21:03.000000000 +0100 @@ -73,6 +73,16 @@ <content type="string" /> <shortdesc lang="en">Service Account to use for authentication to the google cloud APIs.</shortdesc> </parameter> + <parameter name="proxyhost" unique="0" required="0"> + <getopt mixed="--proxyhost=[proxy_host]" /> + <content type="string" /> + <shortdesc lang="en">If a proxy is used for internet access, the proxy host should be specified.</shortdesc> + </parameter> + <parameter name="proxyport" unique="0" required="0"> + <getopt mixed="--proxyport=[proxy_port]" /> + <content type="integer" /> + <shortdesc lang="en">If a proxy is used for internet access, the proxy port should be specified.</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.7.0+git.1612425309.e4f51e44/tests/data/metadata/fence_redfish.xml new/fence-agents-4.7.1+git.1612974063.9e01fc92/tests/data/metadata/fence_redfish.xml --- old/fence-agents-4.7.0+git.1612425309.e4f51e44/tests/data/metadata/fence_redfish.xml 2021-02-04 08:55:09.000000000 +0100 +++ new/fence-agents-4.7.1+git.1612974063.9e01fc92/tests/data/metadata/fence_redfish.xml 2021-02-10 17:21:03.000000000 +0100 @@ -187,5 +187,6 @@ <action name="metadata" /> <action name="manpage" /> <action name="validate-all" /> + <action name="diag" /> </actions> </resource-agent>
