From 2e4d0ff2e0826fd4e6ca02afbecf678a04709e7e Mon Sep 17 00:00:00 2001 From: Philipp Hausmann Date: Mon, 20 Feb 2017 17:24:45 +0100 Subject: [PATCH 1/7] cloud-init: 0.7.6 -> 0.7.9 --- .../cloud-init/add-nixos-support.patch | 113 ++++++++++++++++++ .../virtualization/cloud-init/default.nix | 13 +- 2 files changed, 121 insertions(+), 5 deletions(-) create mode 100644 pkgs/tools/virtualization/cloud-init/add-nixos-support.patch diff --git a/pkgs/tools/virtualization/cloud-init/add-nixos-support.patch b/pkgs/tools/virtualization/cloud-init/add-nixos-support.patch new file mode 100644 index 000000000000..00cb7d070c64 --- /dev/null +++ b/pkgs/tools/virtualization/cloud-init/add-nixos-support.patch @@ -0,0 +1,113 @@ +diff -ruN cloud-init-0.7.6.orig/cloudinit/distros/__init__.py cloud-init-0.7.6/cloudinit/distros/__init__.py +--- cloud-init-0.7.6.orig/cloudinit/distros/__init__.py 2014-10-10 15:26:25.000000000 +0000 ++++ cloud-init-0.7.6/cloudinit/distros/__init__.py 2016-06-08 07:51:45.230357099 +0000 +@@ -43,6 +43,7 @@ + 'freebsd': ['freebsd'], + 'suse': ['sles'], + 'arch': ['arch'], ++ 'nixos': ['nixos'], + } + + LOG = logging.getLogger(__name__) +diff -ruN cloud-init-0.7.6.orig/cloudinit/distros/nixos.py cloud-init-0.7.6/cloudinit/distros/nixos.py +--- cloud-init-0.7.6.orig/cloudinit/distros/nixos.py 1970-01-01 00:00:00.000000000 +0000 ++++ cloud-init-0.7.6/cloudinit/distros/nixos.py 2016-06-08 07:50:58.602616595 +0000 +@@ -0,0 +1,98 @@ ++# vi: ts=4 expandtab ++# ++# Copyright (C) 2012 Canonical Ltd. ++# Copyright (C) 2012 Hewlett-Packard Development Company, L.P. ++# Copyright (C) 2012 Yahoo! Inc. ++# ++# Author: Scott Moser ++# Author: Juerg Haefliger ++# Author: Joshua Harlow ++# ++# 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 . ++ ++from cloudinit import distros ++from cloudinit import helpers ++from cloudinit import log as logging ++from cloudinit import util ++ ++from cloudinit.distros.parsers.hostname import HostnameConf ++ ++LOG = logging.getLogger(__name__) ++ ++class Distro(distros.Distro): ++ ++ def __init__(self, name, cfg, paths): ++ distros.Distro.__init__(self, name, cfg, paths) ++ # This will be used to restrict certain ++ # calls from repeatly happening (when they ++ # should only happen say once per instance...) ++ self._runner = helpers.Runners(paths) ++ self.osfamily = 'nixos' ++ ++ def _select_hostname(self, hostname, fqdn): ++ # Prefer the short hostname over the long ++ # fully qualified domain name ++ if not hostname: ++ return fqdn ++ return hostname ++ ++ def _write_hostname(self, your_hostname, out_fn): ++ conf = None ++ try: ++ # Try to update the previous one ++ # so lets see if we can read it first. ++ conf = self._read_hostname_conf(out_fn) ++ except IOError: ++ pass ++ if not conf: ++ conf = HostnameConf('') ++ conf.set_hostname(your_hostname) ++ util.write_file(out_fn, str(conf), 0644) ++ ++ def _read_system_hostname(self): ++ sys_hostname = self._read_hostname(self.hostname_conf_fn) ++ return (self.hostname_conf_fn, sys_hostname) ++ ++ def _read_hostname_conf(self, filename): ++ conf = HostnameConf(util.load_file(filename)) ++ conf.parse() ++ return conf ++ ++ def _read_hostname(self, filename, default=None): ++ hostname = None ++ try: ++ conf = self._read_hostname_conf(filename) ++ hostname = conf.hostname ++ except IOError: ++ pass ++ if not hostname: ++ return default ++ return hostname ++ ++ def _write_network(self, settings): ++ raise NotImplementedError() ++ ++ def apply_locale(self, locale, out_fn=None): ++ raise NotImplementedError() ++ ++ def install_packages(self, pkglist): ++ raise NotImplementedError() ++ ++ def package_command(self, command, args=None, pkgs=None): ++ raise NotImplementedError() ++ ++ def set_timezone(self, tz): ++ raise NotImplementedError() ++ ++ def update_package_sources(self): ++ raise NotImplementedError() diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index c038ca7c1bbe..2b62e443e565 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -1,6 +1,6 @@ -{ lib, pythonPackages, fetchurl }: +{ lib, pythonPackages, fetchurl, kmod, systemd }: -let version = "0.7.6"; +let version = "0.7.9"; in pythonPackages.buildPythonApplication rec { name = "cloud-init-${version}"; @@ -8,9 +8,10 @@ in pythonPackages.buildPythonApplication rec { src = fetchurl { url = "https://launchpad.net/cloud-init/trunk/${version}/+download/cloud-init-${version}.tar.gz"; - sha256 = "1mry5zdkfaq952kn1i06wiggc66cqgfp6qgnlpk0mr7nnwpd53wy"; + sha256 = "0wnl76pdcj754pl99wxx76hkir1s61x0bg0lh27sdgdxy45vivbn"; }; + patches = [ ./add-nixos-support.patch ]; patchPhase = '' patchShebangs ./tools @@ -19,15 +20,17 @@ in pythonPackages.buildPythonApplication rec { --replace /etc $out/etc \ --replace /lib/systemd $out/lib/systemd \ --replace 'self.init_system = ""' 'self.init_system = "systemd"' + + patchPhase ''; propagatedBuildInputs = with pythonPackages; [ cheetah jinja2 prettytable - oauth pyserial configobj pyyaml argparse requests jsonpatch ]; + oauthlib pyserial configobj pyyaml argparse requests jsonpatch ]; meta = { homepage = http://cloudinit.readthedocs.org; description = "Provides configuration and customization of cloud instance"; - maintainers = [ lib.maintainers.madjar ]; + maintainers = [ lib.maintainers.madjar lib.maintainers.phile314 ]; platforms = lib.platforms.all; }; } From a0f4a720c8f568a20ee1d80ca8e67bfb8e48eca0 Mon Sep 17 00:00:00 2001 From: Philipp Hausmann Date: Mon, 20 Feb 2017 17:24:57 +0100 Subject: [PATCH 2/7] cloud-init module: Replace hard-coded config by option. --- nixos/modules/services/system/cloud-init.nix | 108 ++++++++++--------- 1 file changed, 58 insertions(+), 50 deletions(-) diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix index 0ef31ef8a8b9..27c382d6890e 100644 --- a/nixos/modules/services/system/cloud-init.nix +++ b/nixos/modules/services/system/cloud-init.nix @@ -3,52 +3,7 @@ with lib; let cfg = config.services.cloud-init; - path = with pkgs; [ cloud-init nettools utillinux e2fsprogs shadow dmidecode openssh ]; - configFile = pkgs.writeText "cloud-init.cfg" '' -users: - - root - -disable_root: false -preserve_hostname: false - -cloud_init_modules: - - migrator - - seed_random - - bootcmd - - write-files - - growpart - - resizefs - - set_hostname - - update_hostname - - update_etc_hosts - - ca-certs - - rsyslog - - users-groups - -cloud_config_modules: - - emit_upstart - - disk_setup - - mounts - - ssh-import-id - - set-passwords - - timezone - - disable-ec2-metadata - - runcmd - - ssh - -cloud_final_modules: - - rightscale_userdata - - scripts-vendor - - scripts-per-once - - scripts-per-boot - - scripts-per-instance - - scripts-user - - ssh-authkey-fingerprints - - keys-to-console - - phone-home - - final-message - - power-state-change -''; + path = with pkgs; [ cloud-init nettools utillinux e2fsprogs shadow openssh iproute ]; in { options = { @@ -74,12 +29,65 @@ in ''; }; + config = mkOption { + type = types.str; + default = '' + system_info: + distro: nixos + users: + - root + + disable_root: false + preserve_hostname: false + + cloud_init_modules: + - migrator + - seed_random + - bootcmd + - write-files + - growpart + - resizefs + - set_hostname + - update_hostname + - update_etc_hosts + - ca-certs + - rsyslog + - users-groups + + cloud_config_modules: + - disk_setup + - mounts + - ssh-import-id + - set-passwords + - timezone + - disable-ec2-metadata + - runcmd + - ssh + + cloud_final_modules: + - rightscale_userdata + - scripts-vendor + - scripts-per-once + - scripts-per-boot + - scripts-per-instance + - scripts-user + - ssh-authkey-fingerprints + - keys-to-console + - phone-home + - final-message + - power-state-change + ''; + description = ''cloud-init configuration.''; + }; + }; }; config = mkIf cfg.enable { + environment.etc."cloud/cloud.cfg".text = cfg.config; + systemd.services.cloud-init-local = { description = "Initial cloud-init job (pre-networking)"; wantedBy = [ "multi-user.target" ]; @@ -88,7 +96,7 @@ in path = path; serviceConfig = { Type = "oneshot"; - ExecStart = "${pkgs.cloud-init}/bin/cloud-init -f ${configFile} init --local"; + ExecStart = "${pkgs.cloud-init}/bin/cloud-init init --local"; RemainAfterExit = "yes"; TimeoutSec = "0"; StandardOutput = "journal+console"; @@ -105,7 +113,7 @@ in path = path; serviceConfig = { Type = "oneshot"; - ExecStart = "${pkgs.cloud-init}/bin/cloud-init -f ${configFile} init"; + ExecStart = "${pkgs.cloud-init}/bin/cloud-init init"; RemainAfterExit = "yes"; TimeoutSec = "0"; StandardOutput = "journal+console"; @@ -121,7 +129,7 @@ in path = path; serviceConfig = { Type = "oneshot"; - ExecStart = "${pkgs.cloud-init}/bin/cloud-init -f ${configFile} modules --mode=config"; + ExecStart = "${pkgs.cloud-init}/bin/cloud-init modules --mode=config"; RemainAfterExit = "yes"; TimeoutSec = "0"; StandardOutput = "journal+console"; @@ -137,7 +145,7 @@ in path = path; serviceConfig = { Type = "oneshot"; - ExecStart = "${pkgs.cloud-init}/bin/cloud-init -f ${configFile} modules --mode=final"; + ExecStart = "${pkgs.cloud-init}/bin/cloud-init modules --mode=final"; RemainAfterExit = "yes"; TimeoutSec = "0"; StandardOutput = "journal+console"; From 9a12461586d8e4428c3093aaca407e79baa84f7a Mon Sep 17 00:00:00 2001 From: Philipp Hausmann Date: Tue, 11 Apr 2017 11:03:34 +0200 Subject: [PATCH 3/7] Remove spurious call to patchPhase. --- pkgs/tools/virtualization/cloud-init/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 2b62e443e565..303c155422f5 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -20,8 +20,6 @@ in pythonPackages.buildPythonApplication rec { --replace /etc $out/etc \ --replace /lib/systemd $out/lib/systemd \ --replace 'self.init_system = ""' 'self.init_system = "systemd"' - - patchPhase ''; propagatedBuildInputs = with pythonPackages; [ cheetah jinja2 prettytable From a03ff825b3da913e4b1d1e09073e2524d6248dba Mon Sep 17 00:00:00 2001 From: Philipp Hausmann Date: Thu, 20 Apr 2017 19:12:08 +0200 Subject: [PATCH 4/7] Revert "Remove spurious call to patchPhase." This reverts commit 9a12461586d8e4428c3093aaca407e79baa84f7a. --- pkgs/tools/virtualization/cloud-init/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 303c155422f5..2b62e443e565 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -20,6 +20,8 @@ in pythonPackages.buildPythonApplication rec { --replace /etc $out/etc \ --replace /lib/systemd $out/lib/systemd \ --replace 'self.init_system = ""' 'self.init_system = "systemd"' + + patchPhase ''; propagatedBuildInputs = with pythonPackages; [ cheetah jinja2 prettytable From 59ca1f6486c21b0e0150942a2206b7a833682613 Mon Sep 17 00:00:00 2001 From: Philipp Hausmann Date: Thu, 20 Apr 2017 19:12:27 +0200 Subject: [PATCH 5/7] cloud-init: Disable broken hostname functionality by default --- nixos/modules/services/system/cloud-init.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix index 27c382d6890e..d513e44dcfba 100644 --- a/nixos/modules/services/system/cloud-init.nix +++ b/nixos/modules/services/system/cloud-init.nix @@ -47,8 +47,6 @@ in - write-files - growpart - resizefs - - set_hostname - - update_hostname - update_etc_hosts - ca-certs - rsyslog From 5083a75a925365852460225417e845852cc09787 Mon Sep 17 00:00:00 2001 From: Philipp Hausmann Date: Fri, 21 Apr 2017 10:55:14 +0200 Subject: [PATCH 6/7] cloud-init: Use prePatch instead of patchPhase hack. --- pkgs/tools/virtualization/cloud-init/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 2b62e443e565..60f38bb1802f 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -12,7 +12,7 @@ in pythonPackages.buildPythonApplication rec { }; patches = [ ./add-nixos-support.patch ]; - patchPhase = '' + prePatch = '' patchShebangs ./tools substituteInPlace setup.py \ @@ -20,8 +20,6 @@ in pythonPackages.buildPythonApplication rec { --replace /etc $out/etc \ --replace /lib/systemd $out/lib/systemd \ --replace 'self.init_system = ""' 'self.init_system = "systemd"' - - patchPhase ''; propagatedBuildInputs = with pythonPackages; [ cheetah jinja2 prettytable From 27e05f98fc379a601aadfda8fefb75dbf1779d22 Mon Sep 17 00:00:00 2001 From: Philipp Hausmann Date: Fri, 21 Apr 2017 12:48:02 +0200 Subject: [PATCH 7/7] cloud-init: Fix growpart support --- pkgs/tools/virtualization/cloud-init/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 60f38bb1802f..94dae1e47faa 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -1,4 +1,4 @@ -{ lib, pythonPackages, fetchurl, kmod, systemd }: +{ lib, pythonPackages, fetchurl, kmod, systemd, cloud-utils }: let version = "0.7.9"; @@ -20,6 +20,9 @@ in pythonPackages.buildPythonApplication rec { --replace /etc $out/etc \ --replace /lib/systemd $out/lib/systemd \ --replace 'self.init_system = ""' 'self.init_system = "systemd"' + + substituteInPlace cloudinit/config/cc_growpart.py \ + --replace 'util.subp(["growpart"' 'util.subp(["${cloud-utils}/bin/growpart"' ''; propagatedBuildInputs = with pythonPackages; [ cheetah jinja2 prettytable