Hello community,
here is the log from the commit of package cloud-netconfig for openSUSE:Factory
checked in at 2017-11-10 14:58:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cloud-netconfig (Old)
and /work/SRC/openSUSE:Factory/.cloud-netconfig.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cloud-netconfig"
Fri Nov 10 14:58:41 2017 rev:3 rq:540361 version:0.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/cloud-netconfig/cloud-netconfig.changes
2017-10-11 23:02:17.770423887 +0200
+++ /work/SRC/openSUSE:Factory/.cloud-netconfig.new/cloud-netconfig.changes
2017-11-10 14:59:04.432439751 +0100
@@ -1,0 +2,23 @@
+Thu Nov 9 15:57:52 UTC 2017 - adrian.glaub...@suse.com
+
+- Add missing Provides/Conflicts statements to spec file
+
+-------------------------------------------------------------------
+Fri Oct 13 15:18:33 UTC 2017 - jgleiss...@suse.com
+
+- Prepare for SLE11 submission (bsc#1063292)
+
+-------------------------------------------------------------------
+Fri Oct 13 13:47:05 UTC 2017 - jgleiss...@suse.com
+
+- Update to version 0.6:
+ + Use tested and supported metadata API versions
+
+-------------------------------------------------------------------
+Wed Oct 11 21:21:52 UTC 2017 - rjsch...@suse.com
+
+- Update to version 0.5
+ + New API version for Azure metadata server
+ + Wait for the metadata server in EC2
+
+-------------------------------------------------------------------
Old:
----
cloud-netconfig-0.4.tar.bz2
New:
----
cloud-netconfig-0.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cloud-netconfig.spec ++++++
--- /var/tmp/diff_new_pack.BNvovQ/_old 2017-11-10 14:59:05.124414721 +0100
+++ /var/tmp/diff_new_pack.BNvovQ/_new 2017-11-10 14:59:05.128414577 +0100
@@ -26,16 +26,18 @@
%if "@BUILD_FLAVOR@" == "azure"
%define flavor_suffix -azure
%define csp_string Microsoft Azure
-Conflicts: %{base_name}-ec2
+Provides: cloud-netconfig
+Conflicts: otherproviders(cloud-netconfig)
%endif
%if "@BUILD_FLAVOR@" == "ec2"
%define flavor_suffix -ec2
%define csp_string Amazon EC2
-Conflicts: %{base_name}-azure
+Provides: cloud-netconfig
+Conflicts: otherproviders(cloud-netconfig)
%endif
Name: %{base_name}%{flavor_suffix}
-Version: 0.4
+Version: 0.6
Release: 0
Summary: Network configuration scripts for %{csp_string}
License: GPL-3.0+
@@ -54,8 +56,8 @@
%endif
BuildRequires: udev
Requires: udev
-# persistent net generator was still part of udev in SLE12 but not in Leap 42
-%if 0%{?is_opensuse} || ( 0%{?sle_version} == 0 || 0%{?sle_version} >= 130000
)
+# persistent net generator was split off from udev in Leap
+%if 0%{?leap_version} != 0
Requires: udev-persistent-ifnames
%endif
++++++ cloud-netconfig-0.4.tar.bz2 -> cloud-netconfig-0.6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cloud-netconfig-0.4/VERSION
new/cloud-netconfig-0.6/VERSION
--- old/cloud-netconfig-0.4/VERSION 2017-10-09 17:34:52.127056335 +0200
+++ new/cloud-netconfig-0.6/VERSION 2017-10-13 15:20:53.524621516 +0200
@@ -1 +1 @@
-0.4
+0.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cloud-netconfig-0.4/azure/functions.cloud-netconfig
new/cloud-netconfig-0.6/azure/functions.cloud-netconfig
--- old/cloud-netconfig-0.4/azure/functions.cloud-netconfig 2017-08-10
17:52:14.238199252 +0200
+++ new/cloud-netconfig-0.6/azure/functions.cloud-netconfig 2017-10-13
14:10:08.036087048 +0200
@@ -18,7 +18,7 @@
METADATA_BASE_URL="http://169.254.169.254/metadata/instance/network/interface/";
URL_HDR="Metadata:true"
-URL_APX='?format=text&api-version=2017-07-01'
+URL_APX='?format=text&api-version=2017-04-02'
# -------------------------------------------------------------------
# get the MAC address from the metadata server
Binary files old/cloud-netconfig-0.4/cloud-netconfig-0.5.tar.bz2 and
new/cloud-netconfig-0.6/cloud-netconfig-0.5.tar.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cloud-netconfig-0.4/cloud-netconfig-azure.spec
new/cloud-netconfig-0.6/cloud-netconfig-azure.spec
--- old/cloud-netconfig-0.4/cloud-netconfig-azure.spec 2017-10-09
17:34:32.770937757 +0200
+++ new/cloud-netconfig-0.6/cloud-netconfig-azure.spec 2017-10-13
15:20:45.056572937 +0200
@@ -18,7 +18,7 @@
%define base_name cloud-netconfig
Name: %{base_name}-azure
-Version: 0.4
+Version: 0.6
Release: 0
License: GPL-3.0+
Summary: Network configuration scripts for Microsoft Azure
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cloud-netconfig-0.4/cloud-netconfig-ec2.spec
new/cloud-netconfig-0.6/cloud-netconfig-ec2.spec
--- old/cloud-netconfig-0.4/cloud-netconfig-ec2.spec 2017-10-09
17:34:36.978963556 +0200
+++ new/cloud-netconfig-0.6/cloud-netconfig-ec2.spec 2017-10-13
15:20:46.568581611 +0200
@@ -18,7 +18,7 @@
%define base_name cloud-netconfig
Name: %{base_name}-ec2
-Version: 0.4
+Version: 0.6
Release: 0
License: GPL-3.0+
Summary: Network configuration scripts for Amazon EC2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cloud-netconfig-0.4/cloud-netconfig.spec
new/cloud-netconfig-0.6/cloud-netconfig.spec
--- old/cloud-netconfig-0.4/cloud-netconfig.spec 2017-10-09
17:34:44.179007672 +0200
+++ new/cloud-netconfig-0.6/cloud-netconfig.spec 2017-10-13
15:20:48.868594805 +0200
@@ -32,7 +32,7 @@
%endif
Name: %{base_name}%{flavor_suffix}
-Version: 0.4
+Version: 0.6
Release: 0
License: GPL-3.0+
Summary: Network configuration scripts for %{csp_string}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cloud-netconfig-0.4/ec2/functions.cloud-netconfig
new/cloud-netconfig-0.6/ec2/functions.cloud-netconfig
--- old/cloud-netconfig-0.4/ec2/functions.cloud-netconfig 2017-08-10
17:52:14.242199273 +0200
+++ new/cloud-netconfig-0.6/ec2/functions.cloud-netconfig 2017-10-13
14:29:09.022762458 +0200
@@ -16,7 +16,8 @@
#
# You should have received a copy of the GNU General Public License
-METADATA_URL_BASE="http://169.254.169.254/latest/meta-data/network/interfaces/macs/";
+API_VERSION="2016-09-02"
+METADATA_URL_BASE="http://169.254.169.254/${API_VERSION}/meta-data/network/interfaces/macs/";
# -------------------------------------------------------------------
# get IPv4 address from the EC2 meta data server and return them
@@ -26,6 +27,19 @@
local addr count=0 hwaddr="$1" prefixlen
test -z "$hwaddr" && return 1
+ # sometimes the entry for a newly attach NIC is not there yet
+ local check_md=$(curl "${METADATA_URL_BASE}" 2>/dev/null | grep "$hwaddr")
+ local attempts=0
+ while [ -z "$check_md" ]; do
+ if [ $attempts -ge 5 ]; then
+ log "Could not get metadata for nic $hwaddr"
+ return
+ fi
+ attempts=$((attempts+1))
+ sleep 1
+ check_md=$(curl "${METADATA_URL_BASE}" 2>/dev/null | grep "$hwaddr")
+ done
+
local cidr_block=$(curl
"${METADATA_URL_BASE}/$hwaddr/subnet-ipv4-cidr-block" 2>/dev/null)
prefixlen=${cidr_block##*/}
curl "${METADATA_URL_BASE}/$hwaddr/local-ipv4s" 2>/dev/null | \
