forked from pool/cloud-init
Robert Schweikert
1609354cf9
- Fix datasourceLocalDisk module in case directory exists but is empty. - Add Conflicts for otherproviders of cloud-init-config. - Add require for python-six (used by several modules) - Add LocalDisk datasource [FATE#321107] - Reworked zypp_add_repos.diff to behave similar to zypper ar - Move cloud.cfg into an own sub-package, so that we can have a product specific version. [FATE#322039] OBS-URL: https://build.opensuse.org/request/show/443055 OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=67
137 lines
4.9 KiB
Diff
137 lines
4.9 KiB
Diff
--- cloudinit/config/cc_zypp_add_repo.py
|
|
+++ cloudinit/config/cc_zypp_add_repo.py 2016/11/23 13:10:49
|
|
@@ -0,0 +1,112 @@
|
|
+# vi: ts=4 expandtab
|
|
+#
|
|
+# Copyright (C) 2016 SUSE LLC.
|
|
+# This file is based on cc_yum_add_repo.py and was rewritten by
|
|
+# Thorsten Kukuk <kukuk@suse.com> for zypp repos.
|
|
+#
|
|
+# Original file was:
|
|
+#
|
|
+# Copyright (C) 2012 Yahoo! Inc.
|
|
+#
|
|
+# Author: Joshua Harlow <harlowja@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()
|
|
+ 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 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
|
|
+ for field in ['enabled', 'autorefresh']:
|
|
+ if field not in repo_config:
|
|
+ repo_config[field] = '1'
|
|
+ if not missing_required:
|
|
+ repo_configs[repo_id] = repo_config
|
|
+ repo_locations[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/23 12:59:42
|
|
@@ -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/Test_Repo.repo
|
|
+# which can then subsequently be used by zypper for later operations.
|
|
+zypp_repos:
|
|
+ # The name of the repository
|
|
+ "Test Repo":
|
|
+ # Any repository configuration options
|
|
+ name: Extra Packages for Testing
|
|
+ enabled: true
|
|
+ autorefresh: true
|
|
+ keeppackages: false
|
|
+ baseurl: http://download.example.com/ibs/TEST/1.0/standard/
|
|
+ gpgcheck: true
|
|
+ gpgkey: http://download.example.com/ibs/TEST/1.0/standard/repodata/repomd.xml.key
|