Hello community,
here is the log from the commit of package cloud-init for openSUSE:Factory
checked in at 2016-11-18 22:01:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cloud-init (Old)
and /work/SRC/openSUSE:Factory/.cloud-init.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cloud-init"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cloud-init/cloud-init.changes 2016-11-12
13:02:33.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.cloud-init.new/cloud-init.changes
2016-11-18 22:01:49.000000000 +0100
@@ -1,0 +2,5 @@
+Sun Nov 13 13:33:41 CET 2016 - ku...@suse.de
+
+- Add zypp_add_repos.diff to support repos for zypper [FATE#322038]
+
+-------------------------------------------------------------------
New:
----
zypp_add_repos.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cloud-init.spec ++++++
--- /var/tmp/diff_new_pack.vgqFpX/_old 2016-11-18 22:01:50.000000000 +0100
+++ /var/tmp/diff_new_pack.vgqFpX/_new 2016-11-18 22:01:50.000000000 +0100
@@ -50,6 +50,7 @@
Patch25: cloud-init-digital-ocean-datasource.patch
Patch26: cloud-init-digital-ocean-datasource-enable-by-default.patch
Patch27: cloud-init-sysconfig-netpathfix.patch
+Patch28: zypp_add_repos.diff
BuildRequires: fdupes
BuildRequires: filesystem
BuildRequires: python-devel
@@ -176,6 +177,7 @@
%patch25 -p1
%patch26 -p1
%patch27
+%patch28 -p0
%if 0%{?suse_version} <= 1130
# disable ecdsa for SLE 11 (not available)
++++++ cloud.cfg.suse ++++++
--- /var/tmp/diff_new_pack.vgqFpX/_old 2016-11-18 22:01:50.000000000 +0100
+++ /var/tmp/diff_new_pack.vgqFpX/_new 2016-11-18 22:01:50.000000000 +0100
@@ -29,6 +29,7 @@
- ssh-import-id
- locale
- set-passwords
+ - zypp_add_repo
- package-update-upgrade-install
- timezone
- puppet
++++++ zypp_add_repos.diff ++++++
--- cloudinit/config/cc_zypp_add_repo.py
+++ cloudinit/config/cc_zypp_add_repo.py 2016/11/13 16:56:21
@@ -0,0 +1,106 @@
+# vi: ts=4 expandtab
+#
+# This file is based on cc_yum_add_repo.py:
+#
+# Copyright (C) 2012 Yahoo! Inc.
+#
+# Author: Joshua Harlow <harlo...@yahoo-inc.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import os
+
+import configobj
+import six
+
+from cloudinit import util
+
+distros = ['opensuse', 'sles']
+
+
+def _canonicalize_id(repo_id):
+ repo_id = repo_id.replace(" ", "_")
+ return repo_id
+
+
+def _format_repo_value(val):
+ if isinstance(val, (bool)):
+ # zypp prefers 1/0
+ return str(int(val))
+ if isinstance(val, (list, tuple)):
+ return "\n ".join([_format_repo_value(v) for v in val])
+ if not isinstance(val, six.string_types):
+ return str(val)
+ return val
+
+
+def _format_repository_config(repo_id, repo_config):
+ to_be = configobj.ConfigObj()
+ to_be[repo_id] = {}
+ # Do basic translation of the items -> values
+ for (k, v) in repo_config.items():
+ # For now assume that people using this know the format
+ # of zypper repos and don't verify keys/values further
+ to_be[repo_id][k] = _format_repo_value(v)
+ lines = to_be.write()
+ lines.insert(0, "# Created by cloud-init on %s" % (util.time_rfc2822()))
+ return "\n".join(lines)
+
+
+def handle(name, cfg, _cloud, log, _args):
+ repos = cfg.get('zypp_repos')
+ if not repos:
+ log.debug(("Skipping module named %s,"
+ " no 'zypp_repos' configuration found"), name)
+ return
+ repo_base_path = util.get_cfg_option_str(cfg, 'zypp_repo_dir',
+ '/etc/zypp/repos.d/')
+ repo_locations = {}
+ repo_configs = {}
+ for (repo_id, repo_config) in repos.items():
+ canon_repo_id = _canonicalize_id(repo_id)
+ repo_fn_pth = os.path.join(repo_base_path, "%s.repo" % (canon_repo_id))
+ if os.path.exists(repo_fn_pth):
+ log.info("Skipping repo %s, file %s already exists!",
+ repo_id, repo_fn_pth)
+ continue
+ elif canon_repo_id in repo_locations:
+ log.info("Skipping repo %s, file %s already pending!",
+ repo_id, repo_fn_pth)
+ continue
+ if not repo_config:
+ repo_config = {}
+ # Do some basic sanity checks/cleaning
+ n_repo_config = {}
+ for (k, v) in repo_config.items():
+ k = k.lower().strip().replace("-", "_")
+ if k:
+ n_repo_config[k] = v
+ repo_config = n_repo_config
+ missing_required = 0
+ for req_field in ['baseurl']:
+ if req_field not in repo_config:
+ log.warn(("Repository %s does not contain a %s"
+ " configuration 'required' entry"),
+ repo_id, req_field)
+ missing_required += 1
+ if not missing_required:
+ repo_configs[canon_repo_id] = repo_config
+ repo_locations[canon_repo_id] = repo_fn_pth
+ else:
+ log.warn("Repository %s is missing %s required fields, skipping!",
+ repo_id, missing_required)
+ for (c_repo_id, path) in repo_locations.items():
+ repo_blob = _format_repository_config(c_repo_id,
+ repo_configs.get(c_repo_id))
+ util.write_file(path, repo_blob)
--- doc/examples/cloud-config-zypp-repo.txt
+++ doc/examples/cloud-config-zypp-repo.txt 2016/11/13 17:04:12
@@ -0,0 +1,18 @@
+#cloud-config
+# vim: syntax=yaml
+#
+# Add zypper repository configuration to the system
+#
+# The following example adds the file /etc/zypp/repos.d/EPEL_TESTING.repo
+# which can then subsequently be used by zypper for later operations.
+zypp_repos:
+ # The name of the repository
+ EPEL_Testing:
+ # Any repository configuration options
+ name: Extra Packages for Testing
+ enabled: true
+ autorefresh: true
+ keeppackages: false
+ baseurl: http://download.example.com/ibs/EPEL/1.0/standard/
+ gpgcheck: true
+ gpgkey:
http://download.example.com/ibs/EPEL/1.0/standard/repodata/repomd.xml.key
