Hello community,
here is the log from the commit of package google-compute-engine.12444 for
openSUSE:Leap:15.1:Update checked in at 2020-05-01 20:23:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.1:Update/google-compute-engine.12444 (Old)
and
/work/SRC/openSUSE:Leap:15.1:Update/.google-compute-engine.12444.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "google-compute-engine.12444"
Fri May 1 20:23:37 2020 rev:1 rq:798011 version:20190801
Changes:
--------
New Changes file:
--- /dev/null 2020-04-14 14:47:33.391806949 +0200
+++
/work/SRC/openSUSE:Leap:15.1:Update/.google-compute-engine.12444.new.2738/google-compute-engine.changes
2020-05-01 20:23:39.162820742 +0200
@@ -0,0 +1,458 @@
+-------------------------------------------------------------------
+Wed Apr 8 15:45:59 UTC 2020 - Robert Schweikert <[email protected]>
+
+- Rename the sysctl file that applies the GCE network settings (bsc#1167810)
+ + The file 11-gce-network-security.conf applies network configuration
+ settings. Specifically the value for net.ipv4.conf.all.rp_filter is also
+ part of the system defaults in /usr/lib/sysctl.d/50-default.conf and thus
+ the default setting was applied, instead of the desired setting. As
+ 50-default is processed after 11-gce-network-security.
+
+-------------------------------------------------------------------
+Tue Oct 22 21:54:57 UTC 2019 - Robert Schweikert <[email protected]>
+
+- Add gcei-waitlimit-dns.patch (bsc#1151398)
+ + Add a wait limit to retrying DNS resolution to avoid a forever loop
+
+-------------------------------------------------------------------
+Tue Sep 17 03:02:11 UTC 2019 - Robert Schweikert <[email protected]>
+
+- Fix file list
+ + On i586 Python code is also under _libdir thus creating a conflict between
+ the packages.
+
+-------------------------------------------------------------------
+Wed Sep 11 11:47:46 UTC 2019 - Robert Schweikert <[email protected]>
+
+- Add gcei_disableipv6.patch (bsc#1150058)
+ + Upstream introduced an interface named "DisableIpv6" but the
+ implementation was incomplete and the interface was missing for SUSE
+ distros
+
+-------------------------------------------------------------------
+Tue Aug 20 11:06:50 UTC 2019 - John Paul Adrian Glaubitz
<[email protected]>
+
+- Fix install location of NSS and PAM shared libraries (bsc#1146172)
+- Switch RPM group for oslogin package from Hardware to System/Daemons
+
+-------------------------------------------------------------------
+Tue Aug 6 10:43:53 UTC 2019 - John Paul Adrian Glaubitz
<[email protected]>
+
+- Add patch to normalize setup version of Python code
+ + gcei-normalize-python-version.patch
+- Fix file matching patterns in %files section for oslogin package
+
+-------------------------------------------------------------------
+Mon Aug 5 13:00:18 UTC 2019 - John Paul Adrian Glaubitz
<[email protected]>
+
+- Update to version 20190801 (bsc#1144092, bsc#1144170)
+ + Google Compute Engine
+ * Re-enable boto config without plugin.
+ * Fix metadata script retrieval for python 2 and 3.
+ + Google Compute Engine OS Login
+ * Fix for 2FA on RHEL 8.
+- from version 20190730
+ + Google Compute Engine
+ * Support for Debian 10.
+ * New package versioning.
+ * Support for Google Private Access over IPv6.
+ * Support root disk expansion in RHEL 8 and Debian 10.
+ + Google Compute Engine OS Login
+ * Bug fixes for sudoers.
+ * Initial groups support (not yet enabled).
+- Add patch to explicitly link NSS and PAM shared
+ libraries against libboost_regex on SLE-12
+ + gcei-link-boost_regex.patch
+- Refresh patches for new version
+ + gcei-scripts-after-reg.patch
+- Set StandardOutput=journal+console in custom systemd service files
+ + google-optimize-local-ssd.service
+ + google-set-multiqueue.service
+- Stop installing configuration file for systemd-journald
+ + Logging is now configured through systemd service files
+- Update file matching patterns in %files section for new version
+
+-------------------------------------------------------------------
+Mon May 27 10:33:55 UTC 2019 - John Paul Adrian Glaubitz
<[email protected]>
+
+- Update to version 20190522 (bsc#1136266, bsc#1136267)
+ + Google Compute Engine
+ * Fix guest attributes flow in Python 3.
+ + Google Compute Engine OS Login
+ * Update OS Login control file for FreeBSD support.
+- from version 20190521
+ + Google Compute Engine
+ * Retry download for metadata scripts.
+ * Fix script retrieval in Python 3.
+ * Disable boto config in Python 3.
+ * Update SSH host keys in guest attributes.
+ * Fix XPS settings with more than 64 vCPUs.
+
+-------------------------------------------------------------------
+Thu May 16 12:48:40 UTC 2019 - John Paul Adrian Glaubitz
<[email protected]>
+
+- Update to version 20190416 (bsc#1128392, bsc#1134179)
+ + Google Compute Engine
+ * FreeBSD fixes: syslog socket location and OS detection.
+ * Upstart systems: only run startup scripts at boot.
+ + Google Compute Engine OS Login
+ * Fix pam_group ordering detection.
+ * Restart cron from the OS Login control file.
+ * Add PAM entry to su:account stack.
+- from version 20190315
+ + Google Compute Engine OS Login
+ * Fix alternate challenge section for two factor authentication.
+ * Fix FreeBSD compatibility issues in the control file.
+- from version 20190304
+ + Google Compute Engine
+ * Set oom_score_adjust for google_accounts_daemon.
+ + Google Compute Engine OS Login
+ * Use pam_group to provide users with default groups.
+ * Add compat.h to support FreeBSD.
+ * Exit immediately after a two factor authentication failure.
+ * Add support for Google phone prompt challenges.
+- Adjust paths for new upstream directory layout in %build and %install
+- Include systemd service file to run google_optimize_local_ssd command
+ + google-optimize-local-ssd.service
+- Include systemd service file to run google_set_multiqueue command
+ + google-set-multiqueue.service
+- Install journald configuration files into /usr/lib/systemd/journald.conf.d
+- Refresh patches for new version
+ + gcei-hide-py-deps.patch
+ + gcei-scripts-after-reg.patch
+ + gcei-set-run_dir.patch
+
+-------------------------------------------------------------------
+Wed Jan 30 13:27:29 UTC 2019 - John Paul Adrian Glaubitz
<[email protected]>
+
+- Update to version 20190124 (bsc#1123671, bsc#1123672)
+ + Google Compute Engine
+ * Fix metadata script retrieval to support Python 3.
+
+-------------------------------------------------------------------
+Mon Jan 21 16:38:20 UTC 2019 - Robert Schweikert <[email protected]>
+
+- Remove dropped service from systemd setup macros (bsc#1122172)
+- Drop use of restart_on_update, force service restart with -f option
+ on service_del_preun and service_del_postun
+- Detect and handle removed services in pre rather than post
+
+-------------------------------------------------------------------
+Tue Dec 11 12:06:51 UTC 2018 - John Paul Adrian Glaubitz
<[email protected]>
+
+- Update to version 20181206 (bsc#1119029, bsc#1119110)
+ + Google Compute Engine
+ * Support enabling OS Login two factor authentication.
+ * Improve accounts support for FreeBSD.
+ + Google Compute Engine OS Login
+ * Support OS Login two factor authentication (Alpha).
+ * Improve SELinux support.
+- from version 20181023
+ + Google Compute Engine
+ * Fix: Update sudoer group membership without overriding local groups.
+- from version 20181018
+ + Google Compute Engine
+ * Fix: Remove users from sudoers group on account removal.
+
+-------------------------------------------------------------------
+Sun Nov 25 18:06:59 UTC 2018 - Robert Schweikert <[email protected]>
+
+- Remove conditions for distributions older than Leap 42.3 and SLE 12
+ + Delete init scripts google-accounts-daemon.suse,
+ google-clock-skew-daemon.suse, google-instance-setup.suse,
+ google-network-daemon.suse, google-shutdown-scripts.suse,
+ google-startup-scripts.suse
+- Fix build for distributions with gcc version less than 4.9
+ + Add new dependency on boost
+
+-------------------------------------------------------------------
+Fri Oct 12 11:02:02 UTC 2018 - John Paul Adrian Glaubitz
<[email protected]>
+
+- Update to version 20181011
+ + Google Compute Engine
+ * Revert: Remove users from sudoers group on account removal.
+- from version 20181008
+ + Google Compute Engine
+ * Remove users from sudoers group on account removal.
+ * Remove gsutil dependency for metadata scripts.
+- from version 20180905
+ + Google Compute Engine
+ * Remove ntp package dependency.
+ * Support Debian 10 Buster.
+ * Restart the network daemon if networking is restarted.
+ * Prevent setup of the default ethernet interface.
+ * Accounts daemon verifies username is 32 characters or less.
+ + Google Compute Engine OS Login
+ * Add user name validation to pam modules.
+ * Return false on failed final load.
+ * Support FreeBSD.
+ * Support Debian 10 Buster.
+- from version 20180611
+ + Google Compute Engine
+ * Prevent IP forwarding daemon log spam.
+ * Make default shell configurable when executing metadata scripts.
+ * Rename distro directory to distro_lib.
+- Refresh patches for new version
+ + gcei-set-run_dir.patch
+
++++ 261 more lines (skipped)
++++ between /dev/null
++++ and
/work/SRC/openSUSE:Leap:15.1:Update/.google-compute-engine.12444.new.2738/google-compute-engine.changes
New:
----
baselibs.conf
compute-image-packages-20190801.tar.gz
gcei-hide-py-deps.patch
gcei-link-boost_regex.patch
gcei-normalize-python-version.patch
gcei-scripts-after-reg.patch
gcei-set-run_dir.patch
gcei-waitlimit-dns.patch
gcei_disableipv6.patch
google-compute-engine-rpmlintrc
google-compute-engine.changes
google-compute-engine.spec
google-optimize-local-ssd.service
google-set-multiqueue.service
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ google-compute-engine.spec ++++++
#
# spec file for package google-compute-engine
#
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define setup_version 20190801.0
Name: google-compute-engine
Version: 20190801
Release: 0
Summary: GCE Instance Initialization
License: Apache-2.0
Group: System/Daemons
URL: https://github.com/GoogleCloudPlatform/compute-image-packages
Source0: compute-image-packages-%{version}.tar.gz
Source7: google-compute-engine-rpmlintrc
Source8: baselibs.conf
Source9: google-optimize-local-ssd.service
Source10: google-set-multiqueue.service
Patch1: gcei-hide-py-deps.patch
Patch2: gcei-scripts-after-reg.patch
Patch3: gcei-set-run_dir.patch
# see: https://github.com/GoogleCloudPlatform/compute-image-packages/issues/830
Patch4: gcei-link-boost_regex.patch
# see: https://github.com/GoogleCloudPlatform/compute-image-packages/issues/831
Patch5: gcei-normalize-python-version.patch
Patch6: gcei_disableipv6.patch
# see: https://github.com/GoogleCloudPlatform/compute-image-packages/issues/862
Patch7: gcei-waitlimit-dns.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Google Compute Engine instance code.
%package init
Summary: GCE Instance Initialization
Group: System/Daemons
Requires: google-compute-engine-oslogin == %{version}
%if 0%{?suse_version} && 0%{?suse_version} > 1315
Requires: python3-distro
Requires: python3-setuptools
%else
Requires: python-setuptools
%endif
Requires: systemd
%{?systemd_requires}
%if 0%{?suse_version} && 0%{?suse_version} > 1315
BuildRequires: python3-distro
BuildRequires: python3-setuptools
%else
BuildRequires: python-setuptools
%endif
BuildArch: noarch
%if 0%{?suse_version} && 0%{?suse_version} <= 1315
# These packages were not released in SLE 15 and later, thus no conflict needed
Conflicts: google-startup-scripts
Conflicts: google-daemon
Conflicts: gcimagebundle
%endif
%description init
Initialization code for Google Compute Engine instances.
%package oslogin
Summary: OS Login Functionality for Google Compute Engine
Group: System/Daemons
Requires: pam
Requires(post): openssh
Requires(post): glibc
%if 0%{?suse_version} && 0%{?suse_version} <= 1315
BuildRequires: boost-devel
%endif
BuildRequires: gcc-c++
BuildRequires: libcurl-devel
BuildRequires: libjson-c-devel
BuildRequires: make
BuildRequires: pam-devel
%description oslogin
Libraries and scripts to enable OS Login functionality for
Google Compute Engine. Modifies sshd, nsswitch, and sshd_pam configurations.
%prep
%setup -q -n compute-image-packages-%{version}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%if 0%{?suse_version} <= 1315
%patch4 -p1
%endif
%patch5 -p1
%patch6 -p1
%patch7
find -name "*.py" | xargs sed -i 'sm#!/usr/bin/pythonmm'
cp %{SOURCE9} google-optimize-local-ssd.service
cp %{SOURCE10} google-set-multiqueue.service
%build
cd packages/python-google-compute-engine
%if 0%{?suse_version} && 0%{?suse_version} > 1315
python3 setup.py build
%else
python setup.py build
%endif
cd ..
pushd google-compute-engine-oslogin
%if 0%{?suse_version} && 0%{?suse_version} > 1315
make %{?_smp_mflags}
%else
make %{?_smp_mflags} LIBS='-lcurl -ljson-c -lboost_regex'
%endif
popd
%install
cd packages/python-google-compute-engine
%if 0%{?suse_version} && 0%{?suse_version} > 1315
python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
%else
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
%endif
cd ..
mkdir -p %{buildroot}%{_bindir}
cp google-compute-engine/src/usr/bin/* %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_sbindir}
# Init
mkdir -p %{buildroot}%{_unitdir}
cp ../google-optimize-local-ssd.service %{buildroot}%{_unitdir}
cp ../google-set-multiqueue.service %{buildroot}%{_unitdir}
cp google-compute-engine/src/lib/systemd/system/*.service
%{buildroot}%{_unitdir}
for srv_name in %{buildroot}%{_unitdir}/*.service; do rc_name=$(basename -s
'.service' $srv_name); ln -s service %{buildroot}%{_sbindir}/rc$rc_name; done
# Sysconfig
mkdir -p %{buildroot}%{_sysconfdir}/sysctl.d
cp google-compute-engine/src/etc/sysctl.d/11-gce-network-security.conf
%{buildroot}%{_sysconfdir}/sysctl.d/52-gce-network-security.conf
# udev
mkdir -p %{buildroot}/usr/lib/udev/rules.d
cp google-compute-engine/src/lib/udev/rules.d/*
%{buildroot}/usr/lib/udev/rules.d
# syslog
mkdir -p %{buildroot}/%{_sysconfdir}/rsyslog.d
cp google-compute-engine/src/etc/rsyslog.d/*
%{buildroot}/%{_sysconfdir}/rsyslog.d
# oslogin
pushd google-compute-engine-oslogin
make install DESTDIR=%{buildroot} LIBDIR=/%{_libdir} PAMDIR=/%{_lib}/security
popd
# kernel module blacklist
mkdir -p %{buildroot}/%{_sysconfdir}/modprobe.d
cp google-compute-engine/src/etc/modprobe.d/gce-blacklist.conf
%{buildroot}/%{_sysconfdir}/modprobe.d/
%pre init
if [ -f /usr/lib/systemd/system/google-ip-forwarding-daemon.service ]; then
systemctl stop --no-block google-ip-forwarding-daemon
systemctl disable google-ip-forwarding-daemon.service
fi
if [ -f /usr/lib/systemd/system/google-network-setup.service ]; then
systemctl stop --no-block google-network-setup
systemctl disable google-network-setup.service
fi
%service_add_pre google-accounts-daemon.service
google-clock-skew-daemon.service google-instance-setup.service
google-network-daemon.service google-optimize-local-ssd.service
google-set-multiqueue.service google-shutdown-scripts.service
google-startup-scripts.service
%post init
%service_add_post google-accounts-daemon.service
google-clock-skew-daemon.service google-instance-setup.service
google-network-daemon.service google-optimize-local-ssd.service
google-set-multiqueue.service google-shutdown-scripts.service
google-startup-scripts.service
if [ "$1" == "2" ] && ! [ -e /.buildenv ]; then
# "$1" == "2" means the package is being upgraded
# ./buildenv is only present during package builds
systemctl enable google-network-daemon.service
systemctl start google-network-daemon.service
fi
%post oslogin
/sbin/ldconfig
%preun init
%service_del_preun -f google-accounts-daemon.service
google-clock-skew-daemon.service google-instance-setup.service
google-network-daemon.service google-optimize-local-ssd.service
google-set-multiqueue.service google-shutdown-scripts.service
google-startup-scripts.service
%postun init
%service_del_postun -f google-accounts-daemon.service
google-clock-skew-daemon.service google-instance-setup.service
google-network-daemon.service google-optimize-local-ssd.service
google-set-multiqueue.service google-shutdown-scripts.service
google-startup-scripts.service
%postun oslogin
/sbin/ldconfig
%files init
%defattr(0644,root,root,0755)
%doc CONTRIB.md README.md
%license LICENSE
%if 0%{?suse_version} && 0%{?suse_version} > 1315
%dir %{python3_sitelib}/google_compute_engine
%dir
%{python3_sitelib}/google_compute_engine-%{setup_version}-py%{py3_ver}.egg-info
%else
%dir %{python_sitelib}/google_compute_engine
%dir
%{python_sitelib}/google_compute_engine-%{setup_version}-py%{py_ver}.egg-info
%endif
%exclude %{_bindir}/google_oslogin_control
%exclude %{_bindir}/google_authorized_keys
%exclude %{_bindir}/google_oslogin_nss_cache
%attr(0755,root,root) %{_bindir}/*
%if 0%{?suse_version} && 0%{?suse_version} > 1315
%{_sbindir}/*
%else
%attr(0755,root,root) %{_sbindir}/*
%endif
%if 0%{?suse_version} && 0%{?suse_version} > 1315
%{python3_sitelib}/google_compute_engine/*
%else
%{python_sitelib}/google_compute_engine/*
%endif
%if 0%{?suse_version} && 0%{?suse_version} > 1315
%{python3_sitelib}/google_compute_engine-%{setup_version}-py%{py3_ver}.egg-info/*
%else
%{python_sitelib}/google_compute_engine-%{setup_version}-py%{py_ver}.egg-info/*
%endif
%{_unitdir}/*.service
%config %{_sysconfdir}/sysctl.d/*
%dir /usr/lib/systemd
%dir /usr/lib/udev
%dir /usr/lib/udev/rules.d
/usr/lib/udev/rules.d/*
%dir %{_sysconfdir}/rsyslog.d
%dir %{_sysconfdir}/modprobe.d
%config %{_sysconfdir}/rsyslog.d/*
%config %{_sysconfdir}/modprobe.d/gce-blacklist.conf
%files oslogin
%defattr(0644,root,root,0755)
%attr(0755,root,root) %{_bindir}/google_oslogin_control
%attr(0755,root,root) %{_bindir}/google_authorized_keys
%attr(0755,root,root) %{_bindir}/google_oslogin_nss_cache
/%{_mandir}/man8/*
/%{_lib}/security/*
/%{_libdir}/libnss*
%changelog
++++++ baselibs.conf ++++++
#
# https://en.opensuse.org/openSUSE:Build_Service_baselibs.conf#Quickstart
#
google-compute-engine-oslogin
++++++ gcei-hide-py-deps.patch ++++++
diff -Nru
compute-image-packages-20190416.orig/packages/python-google-compute-engine/setup.py
compute-image-packages-20190416/packages/python-google-compute-engine/setup.py
---
compute-image-packages-20190416.orig/packages/python-google-compute-engine/setup.py
2019-04-17 02:46:12.000000000 +0200
+++
compute-image-packages-20190416/packages/python-google-compute-engine/setup.py
2019-05-06 16:45:55.321595572 +0200
@@ -29,7 +29,7 @@
author_email='[email protected]',
description='Google Compute Engine',
include_package_data=True,
- install_requires=install_requires,
+# install_requires=install_requires,
license='Apache Software License',
long_description='Google Compute Engine guest environment.',
name='google-compute-engine',
++++++ gcei-link-boost_regex.patch ++++++
diff -Nru
compute-image-packages-20190801.orig/packages/google-compute-engine-oslogin/src/Makefile
compute-image-packages-20190801/packages/google-compute-engine-oslogin/src/Makefile
---
compute-image-packages-20190801.orig/packages/google-compute-engine-oslogin/src/Makefile
2019-08-02 01:32:44.000000000 +0200
+++
compute-image-packages-20190801/packages/google-compute-engine-oslogin/src/Makefile
2019-08-05 12:51:35.235998350 +0200
@@ -9,7 +9,7 @@
CXXFLAGS = $(FLAGS)
LDFLAGS = -shared -Wl,-soname,$(SONAME)
-LDLIBS = -lcurl -ljson-c
+LDLIBS = -lcurl -ljson-c -lboost_regex
PAMLIBS = -lpam $(LDLIBS)
# Paths which should be overrideable.
++++++ gcei-normalize-python-version.patch ++++++
diff -Nru
compute-image-packages-20190801.orig/packages/python-google-compute-engine/setup.py
compute-image-packages-20190801/packages/python-google-compute-engine/setup.py
---
compute-image-packages-20190801.orig/packages/python-google-compute-engine/setup.py
2019-08-02 01:32:44.000000000 +0200
+++
compute-image-packages-20190801/packages/python-google-compute-engine/setup.py
2019-08-05 19:01:20.329127848 +0200
@@ -37,7 +37,7 @@
name='google-compute-engine',
packages=setuptools.find_packages(),
url='https://github.com/GoogleCloudPlatform/compute-image-packages',
- version='20190801.00',
+ version='20190801.0',
# Entry points create scripts in /usr/bin that call a function.
entry_points={
'console_scripts': [
++++++ gcei-scripts-after-reg.patch ++++++
diff -Nru
compute-image-packages-20190801.orig/packages/google-compute-engine/src/lib/systemd/system/google-startup-scripts.service
compute-image-packages-20190801/packages/google-compute-engine/src/lib/systemd/system/google-startup-scripts.service
---
compute-image-packages-20190801.orig/packages/google-compute-engine/src/lib/systemd/system/google-startup-scripts.service
2019-08-02 01:32:44.000000000 +0200
+++
compute-image-packages-20190801/packages/google-compute-engine/src/lib/systemd/system/google-startup-scripts.service
2019-08-04 18:45:31.795657246 +0200
@@ -2,6 +2,7 @@
Description=Google Compute Engine Startup Scripts
After=network-online.target network.target rsyslog.service
After=google-instance-setup.service google-network-daemon.service
+After=guestregister.service
[Service]
ExecStart=/usr/bin/google_metadata_script_runner --script-type startup
++++++ gcei-set-run_dir.patch ++++++
diff -Nru
compute-image-packages-20190416.orig/packages/python-google-compute-engine/google_compute_engine/instance_setup/instance_config.py
compute-image-packages-20190416/packages/python-google-compute-engine/google_compute_engine/instance_setup/instance_config.py
---
compute-image-packages-20190416.orig/packages/python-google-compute-engine/google_compute_engine/instance_setup/instance_config.py
2019-04-17 02:46:12.000000000 +0200
+++
compute-image-packages-20190416/packages/python-google-compute-engine/google_compute_engine/instance_setup/instance_config.py
2019-05-06 16:48:54.899274132 +0200
@@ -88,7 +88,7 @@
'target_instance_ips': 'true',
},
'MetadataScripts': {
- 'run_dir': '',
+ 'run_dir': '/var/run',
'startup': 'true',
'shutdown': 'true',
'default_shell': '/bin/bash',
++++++ gcei-waitlimit-dns.patch ++++++
---
packages/python-google-compute-engine/google_compute_engine/metadata_watcher.py.orig
+++
packages/python-google-compute-engine/google_compute_engine/metadata_watcher.py
@@ -154,7 +154,7 @@ class MetadataWatcher(object):
def _HandleMetadataUpdate(
self, metadata_key='', recursive=True, wait=True, timeout=None,
- retry=True):
+ retry=True, retry_limit=50):
"""Wait for a successful metadata response.
Args:
@@ -163,12 +163,14 @@ class MetadataWatcher(object):
wait: bool, True if we should wait for a metadata change.
timeout: int, timeout in seconds for returning metadata output.
retry: bool, True if we should retry on failure.
+ retry_limit: int, number of times to retry obtaining metadata.
Returns:
json, the deserialized contents of the metadata server.
"""
exception = None
- while True:
+ retry_count = 0
+ while retry_count < retry_limit:
try:
return self._GetMetadataUpdate(
metadata_key=metadata_key, recursive=recursive, wait=wait,
@@ -178,6 +180,7 @@ class MetadataWatcher(object):
exception = e
self.logger.error('GET request error retrieving metadata. %s.', e)
if retry:
+ retry_count += 1
continue
else:
break
++++++ gcei_disableipv6.patch ++++++
>From 028fcda7d0d5b62770d24985dec464b1fea48ee6 Mon Sep 17 00:00:00 2001
From: Zach Marano <[email protected]>
Date: Tue, 10 Sep 2019 14:59:38 -0700
Subject: [PATCH] Add missing DisableIpv6 function for SLES 12 and default
case.
---
.../google_compute_engine/distro_lib/sles_12/utils.py | 9 +++++++++
.../google_compute_engine/distro_lib/utils.py | 9 +++++++++
2 files changed, 18 insertions(+)
diff --git
a/packages/python-google-compute-engine/google_compute_engine/distro_lib/sles_12/utils.py
b/packages/python-google-compute-engine/google_compute_engine/distro_lib/sles_12/utils.py
index a8bd4864..aacfc471 100644
---
a/packages/python-google-compute-engine/google_compute_engine/distro_lib/sles_12/utils.py
+++
b/packages/python-google-compute-engine/google_compute_engine/distro_lib/sles_12/utils.py
@@ -39,6 +39,15 @@ def EnableIpv6(self, interfaces, logger,
dhclient_script=None):
"""
pass
+ def DisableIpv6(self, interfaces, logger):
+ """Disable Ipv6.
+
+ Args:
+ interface: string, the output device names for enabling IPv6.
+ logger: logger object, used to write to SysLog and serial port.
+ """
+ pass
+
def EnableNetworkInterfaces(self, interfaces, logger, dhclient_script=None):
"""Enable the list of network interfaces.
diff --git
a/packages/python-google-compute-engine/google_compute_engine/distro_lib/utils.py
b/packages/python-google-compute-engine/google_compute_engine/distro_lib/utils.py
index df1d45cd..50f4f986 100644
---
a/packages/python-google-compute-engine/google_compute_engine/distro_lib/utils.py
+++
b/packages/python-google-compute-engine/google_compute_engine/distro_lib/utils.py
@@ -37,6 +37,15 @@ def EnableIpv6(self, interfaces, logger,
dhclient_script=None):
"""
pass
+ def DisableIpv6(self, interfaces, logger):
+ """Disable Ipv6.
+
+ Args:
+ interface: string, the output device names for enabling IPv6.
+ logger: logger object, used to write to SysLog and serial port.
+ """
+ pass
+
def EnableNetworkInterfaces(self, interfaces, logger, dhclient_script=None):
"""Enable the list of network interfaces.
++++++ google-compute-engine-rpmlintrc ++++++
addFilter("shlib-policy-name-error")
++++++ google-optimize-local-ssd.service ++++++
[Unit]
Description=Google Compute Engine Local SSD Optimization
After=local-fs.target
Wants=local-fs.target
[Service]
Type=oneshot
ExecStart=/usr/bin/google_optimize_local_ssd
StandardOutput=journal+console
[Install]
WantedBy=multi-user.target
++++++ google-set-multiqueue.service ++++++
[Unit]
Description=Google Compute Engine Set Multi-Queue
After=local-fs.target network.target
Wants=local-fs.target network.target
[Service]
Type=oneshot
ExecStart=/usr/bin/google_set_multiqueue
StandardOutput=journal+console
[Install]
WantedBy=multi-user.target
