From ae765a7182d60e0984b5ebc6684aac895b8f3c8e Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Mon, 11 Jun 2012 22:15:11 -0700 Subject: Update with parsing of a requirments file, changelog for this new refactoring stuff and setup.py for both of those. --- setup.py | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 52 insertions(+), 14 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index f32662b8..96f889d8 100755 --- a/setup.py +++ b/setup.py @@ -1,10 +1,12 @@ -#!/usr/bin/python # vi: ts=4 expandtab # # Distutils magic for ec2-init +# # Copyright (C) 2009 Canonical Ltd. +# Copyright (C) 2012 Yahoo! Inc. # # Author: Soren Hansen +# 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 @@ -17,24 +19,59 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# -from distutils.core import setup + from glob import glob -import os.path -import subprocess + +import os +import re + +from distutils.core import setup +from setuptools import find_packages + def is_f(p): - return(os.path.isfile(p)) + return os.path.isfile(p) + + +def versions(fn="ChangeLog"): + with open(fn, 'r') as fh: + lines = fh.read().splitlines() + versions = [] + for line in lines: + line = line.strip() + if line.startswith("-") or not line: + continue + if not re.match(r"[\d]", line): + continue + line = line.strip(":") + if (re.match(r"^[\d+]\.[\d+]\.[\d+]$", line) or + re.match(r"^[\d+]\.[\d+]$", line)): + versions.append(line) + return versions + + +def requires(fn='Requires'): + requires = [] + with open(fn, 'r') as fh: + lines = fh.read().splitlines() + for line in lines: + line = line.strip() + if not line or line[0] == '#': + continue + else: + requires.append(line) + return requires + setup(name='cloud-init', - version='0.6.3', + version=versions()[0], description='EC2 initialisation magic', author='Scott Moser', author_email='scott.moser@canonical.com', url='http://launchpad.net/cloud-init/', - packages=['cloudinit', 'cloudinit.CloudConfig' ], - scripts=['cloud-init.py', - 'cloud-init-cfg.py', + packages=find_packages(), + scripts=['bin/cloud-init.py', + 'bin/cloud-init-cfg.py', 'tools/cloud-init-per', ], data_files=[('/etc/cloud', glob('config/*.cfg')), @@ -42,11 +79,12 @@ setup(name='cloud-init', ('/etc/cloud/templates', glob('templates/*')), ('/etc/init', glob('upstart/*.conf')), ('/usr/share/cloud-init', []), - ('/usr/lib/cloud-init', + ('/usr/lib/cloud-init', ['tools/uncloud-init', 'tools/write-ssh-key-fingerprints']), - ('/usr/share/doc/cloud-init', filter(is_f,glob('doc/*'))), - ('/usr/share/doc/cloud-init/examples', filter(is_f,glob('doc/examples/*'))), - ('/usr/share/doc/cloud-init/examples/seed', filter(is_f,glob('doc/examples/seed/*'))), + ('/usr/share/doc/cloud-init', filter(is_f, glob('doc/*'))), + ('/usr/share/doc/cloud-init/examples', filter(is_f, glob('doc/examples/*'))), + ('/usr/share/doc/cloud-init/examples/seed', filter(is_f, glob('doc/examples/seed/*'))), ('/etc/profile.d', ['tools/Z99-cloud-locale-test.sh']), ], + install_requires=requires(), ) -- cgit v1.2.3 From 25403168cea7b0ece56bc98a0b3ed05043182c91 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Wed, 20 Jun 2012 16:24:24 -0400 Subject: update tools/bddeb and debian.trunk packaging * debian.trunk/changelog: increase debian version to '1' to avoid lintian error * debian.trunk/control: bump standards version * debian.trunk/rules: remove cloud-init-run-module symlink (been deprecated for some time) * tools/bddeb: read version from ChangeLog rather than setup.py --- debian.trunk/changelog | 2 +- debian.trunk/control | 2 +- debian.trunk/rules | 1 - setup.py | 3 +-- tools/bddeb | 6 +++--- 5 files changed, 6 insertions(+), 8 deletions(-) (limited to 'setup.py') diff --git a/debian.trunk/changelog b/debian.trunk/changelog index 53e3678c..a36d00d6 100644 --- a/debian.trunk/changelog +++ b/debian.trunk/changelog @@ -1,4 +1,4 @@ -cloud-init (VERSION~REVNO-0) UNRELEASED; urgency=low +cloud-init (VERSION~REVNO-1) UNRELEASED; urgency=low * build diff --git a/debian.trunk/control b/debian.trunk/control index f2eec1e4..f0dcef6a 100644 --- a/debian.trunk/control +++ b/debian.trunk/control @@ -10,7 +10,7 @@ Build-Depends: cdbs, pylint, python-mocker, XS-Python-Version: all -Standards-Version: 3.9.1 +Standards-Version: 3.9.3 Package: cloud-init Architecture: all diff --git a/debian.trunk/rules b/debian.trunk/rules index 19384687..0f79136c 100755 --- a/debian.trunk/rules +++ b/debian.trunk/rules @@ -13,7 +13,6 @@ cloud-init-fixups: for x in $(DEB_DESTDIR)/usr/bin/*.py; do mv "$$x" "$${x%.py}"; done install -d $(DEB_DESTDIR)/etc/rsyslog.d cp tools/21-cloudinit.conf $(DEB_DESTDIR)/etc/rsyslog.d/21-cloudinit.conf - ln -sf cloud-init-per $(DEB_DESTDIR)/usr/bin/cloud-init-run-module # You only need to run this immediately after checking out the package from # revision control. diff --git a/setup.py b/setup.py index 96f889d8..9ee58b9a 100755 --- a/setup.py +++ b/setup.py @@ -70,8 +70,7 @@ setup(name='cloud-init', author_email='scott.moser@canonical.com', url='http://launchpad.net/cloud-init/', packages=find_packages(), - scripts=['bin/cloud-init.py', - 'bin/cloud-init-cfg.py', + scripts=['bin/cloud-init', 'tools/cloud-init-per', ], data_files=[('/etc/cloud', glob('config/*.cfg')), diff --git a/tools/bddeb b/tools/bddeb index 598f71bb..b162b06f 100755 --- a/tools/bddeb +++ b/tools/bddeb @@ -8,8 +8,8 @@ set -e trap "rm -Rf '${TEMP_D}'" exit files=$(bzr ls --versioned) revno=$(bzr revno) -version=$(awk \ - -F= '$1 ~ /version$/ { gsub("[^0-9.]","",$2); print $2; }' setup.py) +version=$(awk -F: \ + '$1 ~ /[0-9][.][0-9]+[.][0-9]+/ { print $1 ; exit(0); }' ChangeLog ) mkdir "${TEMP_D}/cloud-init" otar="$TEMP_D/cloud-init_$version~bzr${revno}.orig.tar.gz" tar -czf - ${files} > "$otar" @@ -25,7 +25,7 @@ debuild "$@" #for x in ../*.deb; do # echo wrote ${x##*/} #done -debname="cloud-init_${version}~bzr${revno}-0_all.deb" +debname="cloud-init_${version}~bzr${revno}-1_all.deb" mv "../$debname" "$start" link="$start/cloud-init_all.deb" echo "wrote $debname" -- cgit v1.2.3 From 00b19244b9e3a88ff6252494e43268ba692815a6 Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Wed, 20 Jun 2012 16:34:09 -0700 Subject: 1. Add a comment that the upstart dir should probably be put elsewhere sometime (in a distro specific build?) since not all distros fully support upstart that is in config here or even have upstart in general at all (for various reasons) 2. Found out that we really do need to specify these 2 packages due to the following a. The cloudinit root needs to be a package (pretty obvious) b. Not so obvious is the cloudinit.conf also needs to be a package so that its modules can be directly imported without referring to the module name. --- setup.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 9ee58b9a..d2e022f0 100755 --- a/setup.py +++ b/setup.py @@ -26,7 +26,6 @@ import os import re from distutils.core import setup -from setuptools import find_packages def is_f(p): @@ -69,13 +68,17 @@ setup(name='cloud-init', author='Scott Moser', author_email='scott.moser@canonical.com', url='http://launchpad.net/cloud-init/', - packages=find_packages(), + # This second package referencing cloudinit.conf.* + # makes the config modules accessible to the whole + # import system... + packages=['cloudinit', 'cloudinit.conf'], scripts=['bin/cloud-init', 'tools/cloud-init-per', ], data_files=[('/etc/cloud', glob('config/*.cfg')), ('/etc/cloud/cloud.cfg.d', glob('config/cloud.cfg.d/*')), ('/etc/cloud/templates', glob('templates/*')), + # Only really need for upstart based systems ('/etc/init', glob('upstart/*.conf')), ('/usr/share/cloud-init', []), ('/usr/lib/cloud-init', -- cgit v1.2.3 From 8e3bda0b1aa127f2dab0b8c8b50de3ee4414d58f Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Wed, 20 Jun 2012 17:32:03 -0700 Subject: Use setuptools instead of disttools, this seems to be needed for requirements to work --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index d2e022f0..45207af9 100755 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ from glob import glob import os import re -from distutils.core import setup +import setuptools def is_f(p): @@ -62,7 +62,7 @@ def requires(fn='Requires'): return requires -setup(name='cloud-init', +setuptools.setup(name='cloud-init', version=versions()[0], description='EC2 initialisation magic', author='Scott Moser', -- cgit v1.2.3 From 26746dda9938a7e0c9b3317938e86f64ac4f4c2f Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Wed, 20 Jun 2012 17:34:36 -0700 Subject: Fix secondary config subdir name --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 45207af9..b55ec4ff 100755 --- a/setup.py +++ b/setup.py @@ -71,7 +71,7 @@ setuptools.setup(name='cloud-init', # This second package referencing cloudinit.conf.* # makes the config modules accessible to the whole # import system... - packages=['cloudinit', 'cloudinit.conf'], + packages=['cloudinit', 'cloudinit.config'], scripts=['bin/cloud-init', 'tools/cloud-init-per', ], -- cgit v1.2.3 From 5d8493461404fea94c671f352e4e42e07f1099e4 Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Wed, 20 Jun 2012 17:45:45 -0700 Subject: Add a license and use find_packages to locate the needed packages --- setup.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index b55ec4ff..81468943 100755 --- a/setup.py +++ b/setup.py @@ -68,13 +68,11 @@ setuptools.setup(name='cloud-init', author='Scott Moser', author_email='scott.moser@canonical.com', url='http://launchpad.net/cloud-init/', - # This second package referencing cloudinit.conf.* - # makes the config modules accessible to the whole - # import system... - packages=['cloudinit', 'cloudinit.config'], + packages=setuptools.find_packages(exclude=['tests']), scripts=['bin/cloud-init', 'tools/cloud-init-per', ], + license='GPLv3', data_files=[('/etc/cloud', glob('config/*.cfg')), ('/etc/cloud/cloud.cfg.d', glob('config/cloud.cfg.d/*')), ('/etc/cloud/templates', glob('templates/*')), -- cgit v1.2.3 From 67c82c0b7edc1e7012a5e2c6959b468abc69b7df Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Mon, 25 Jun 2012 13:08:20 -0700 Subject: Use the new tool created to get the version. --- setup.py | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 81468943..59548a41 100755 --- a/setup.py +++ b/setup.py @@ -27,26 +27,17 @@ import re import setuptools +import subprocess + def is_f(p): return os.path.isfile(p) -def versions(fn="ChangeLog"): - with open(fn, 'r') as fh: - lines = fh.read().splitlines() - versions = [] - for line in lines: - line = line.strip() - if line.startswith("-") or not line: - continue - if not re.match(r"[\d]", line): - continue - line = line.strip(":") - if (re.match(r"^[\d+]\.[\d+]\.[\d+]$", line) or - re.match(r"^[\d+]\.[\d+]$", line)): - versions.append(line) - return versions +def get_version(): + cmd = ['tools/read-version'] + ver = subprocess.check_output(cmd) + return ver.strip() def requires(fn='Requires'): @@ -63,7 +54,7 @@ def requires(fn='Requires'): setuptools.setup(name='cloud-init', - version=versions()[0], + version=get_version(), description='EC2 initialisation magic', author='Scott Moser', author_email='scott.moser@canonical.com', -- cgit v1.2.3 From e7878007a41fb965886adfa0abc95ebd548b3f80 Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Mon, 25 Jun 2012 16:59:54 -0700 Subject: Use the standard utils now in tools for reading requires/dependencies/versions. --- setup.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 59548a41..fd67da46 100755 --- a/setup.py +++ b/setup.py @@ -29,6 +29,12 @@ import setuptools import subprocess +def tiny_p(cmd): + sp = subprocess.Popen(cmd, stdout=subprocess.PIPE, + stderr=subprocess.PIPE, stdin=None) + (out, err) = sp.communicate() + return (out, err) + def is_f(p): return os.path.isfile(p) @@ -36,21 +42,14 @@ def is_f(p): def get_version(): cmd = ['tools/read-version'] - ver = subprocess.check_output(cmd) + (ver, _e) = tiny_p(cmd) return ver.strip() -def requires(fn='Requires'): - requires = [] - with open(fn, 'r') as fh: - lines = fh.read().splitlines() - for line in lines: - line = line.strip() - if not line or line[0] == '#': - continue - else: - requires.append(line) - return requires +def read_requires(): + cmd = ['tools/read-dependencies'] + (deps, _e) = tiny_p(cmd) + return deps.splitlines() setuptools.setup(name='cloud-init', @@ -68,14 +67,15 @@ setuptools.setup(name='cloud-init', ('/etc/cloud/cloud.cfg.d', glob('config/cloud.cfg.d/*')), ('/etc/cloud/templates', glob('templates/*')), # Only really need for upstart based systems - ('/etc/init', glob('upstart/*.conf')), + #('/etc/init', glob('upstart/*.conf')), ('/usr/share/cloud-init', []), ('/usr/lib/cloud-init', ['tools/uncloud-init', 'tools/write-ssh-key-fingerprints']), ('/usr/share/doc/cloud-init', filter(is_f, glob('doc/*'))), ('/usr/share/doc/cloud-init/examples', filter(is_f, glob('doc/examples/*'))), ('/usr/share/doc/cloud-init/examples/seed', filter(is_f, glob('doc/examples/seed/*'))), - ('/etc/profile.d', ['tools/Z99-cloud-locale-test.sh']), + # ?? + # ('/etc/profile.d', ['tools/Z99-cloud-locale-test.sh']), ], - install_requires=requires(), + install_requires=read_requires(), ) -- cgit v1.2.3 From eb74655ae9826dcde235f1849b50e7d5a2b02223 Mon Sep 17 00:00:00 2001 From: harlowja Date: Tue, 26 Jun 2012 07:47:29 -0700 Subject: Add all the upstart/systemd/init.d files. Let the package building solutions figure out exactly which of these they wish to delete or wish to take, since setup.py can not know it just has to install them all. --- setup.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index fd67da46..402443ea 100755 --- a/setup.py +++ b/setup.py @@ -67,7 +67,11 @@ setuptools.setup(name='cloud-init', ('/etc/cloud/cloud.cfg.d', glob('config/cloud.cfg.d/*')), ('/etc/cloud/templates', glob('templates/*')), # Only really need for upstart based systems - #('/etc/init', glob('upstart/*.conf')), + ('/etc/init', glob('upstart/*.conf')), + # Only really need for systemd based systems + ('/etc/systemd/system', glob('systemd/*.service')), + # Only really need for init.d based system + ('/etc/init.d', glob('initd/*')), ('/usr/share/cloud-init', []), ('/usr/lib/cloud-init', ['tools/uncloud-init', 'tools/write-ssh-key-fingerprints']), -- cgit v1.2.3 From 620afaecf0832fa539afa13ae0844e5582fc85f6 Mon Sep 17 00:00:00 2001 From: harlowja Date: Tue, 26 Jun 2012 07:56:54 -0700 Subject: Copy the tiny_p from the packager code --- setup.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 402443ea..810ebb48 100755 --- a/setup.py +++ b/setup.py @@ -29,10 +29,20 @@ import setuptools import subprocess -def tiny_p(cmd): - sp = subprocess.Popen(cmd, stdout=subprocess.PIPE, - stderr=subprocess.PIPE, stdin=None) + +def tiny_p(cmd, capture=True): + # Darn python 2.6 doesn't have check_output (argggg) + stdout = subprocess.PIPE + stderr = subprocess.PIPE + if not capture: + stdout = None + stderr = None + sp = subprocess.Popen(cmd, stdout=stdout, + stderr=stderr, stdin=None) (out, err) = sp.communicate() + if sp.returncode not in [0]: + raise RuntimeError("Failed running %s [rc=%s] (%s, %s)" + % (cmd, sp.returncode, out, err)) return (out, err) -- cgit v1.2.3 From 37aa678a39d8ac568351ce754d202c1069034d1c Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Mon, 2 Jul 2012 15:40:51 -0700 Subject: 1. Fixup the setup.py to not include custom startup scripts, let the packaging solutions handle these 2. Get the cloud-init specfile working for the init.d case (with the right postun and post and install sections) a. It works!!! --- packages/brpm | 106 ++++-------------------- packages/redhat/cloud-init.spec | 179 ++++++++++++++++++++++++++++++++++------ setup.py | 8 -- 3 files changed, 171 insertions(+), 122 deletions(-) (limited to 'setup.py') diff --git a/packages/brpm b/packages/brpm index bbf30565..3abd9f15 100755 --- a/packages/brpm +++ b/packages/brpm @@ -71,6 +71,7 @@ def get_log_header(version): def format_change_line(ds, who, comment=None): + # Rpmbuild seems to be pretty strict about the date format d = ds.strftime("%a %b %d %Y") d += " - %s" % (who) if comment: @@ -134,94 +135,22 @@ def generate_spec_contents(args, tmpl_fn): changelog_lines.append(line) subs['changelog'] = "\n".join(changelog_lines) - # See: http://www.zarb.org/~jasonc/macros.php - # Pickup any special files - docs = [ - 'TODO', - 'LICENSE', - 'ChangeLog', - 'Requires', - '%{_defaultdocdir}/cloud-init/*', - ] - subs['docs'] = docs - configs = [ - 'cloud/cloud.cfg', - 'cloud/cloud.cfg.d/*.cfg', - 'cloud/cloud.cfg.d/README', - 'cloud/templates/*', - ] - subs['configs'] = configs - other_files = [ - '%{_bindir}/*', - '/usr/lib/cloud-init/*', - ] - - # Since setup.py installs them all, we need to selectively - # remove the wrong ones and ensure the right one/s are kept - # for the boot mode that is desired... - boot_remove = { - 'initd': [ - '/etc/init.d/cloud-init-local', - # Remove the other auto-start folders - '/etc/systemd/', - '/etc/init/', - ], - 'initd-local': [ - '/etc/init.d/cloud-init', - # Remove the other auto-start folders - '/etc/systemd/', - '/etc/init/', - ], - # It seems like systemd can work with - # all of its files being 'active' (and not have naming - # or event name conflicts??) - 'systemd': [ - # Remove the other auto-start folders - '/etc/init.d/', - '/etc/init/', - ], - 'upstart': [ - '/etc/init/cloud-init-nonet.conf', - '/etc/init/cloud-init-local.conf', - # Remove the other auto-start folders - '/etc/init.d/', - '/etc/systemd/', - ], - 'upstart-local': [ - '/etc/init/cloud-init.conf', - # Remove the other auto-start folders - '/etc/init.d/', - '/etc/systemd/', - ] - } - boot_keep = { - 'systemd': [ - '/etc/systemd/*', - ], - 'upstart': [ - '/etc/init/*', - ], - 'upstart-local': [ - '/etc/init/*', - ], - 'initd-local': [ - '/etc/init.d/*', - ], - 'initd': [ - '/etc/init.d/*', - ], - } - subs['post_remove'] = boot_remove[args.boot] - other_files.extend(boot_keep[args.boot]) - subs['files'] = other_files - return templater.render_from_file(tmpl_fn, params=subs) + if args.boot == 'initd': + subs['init_d'] = True + subs['init_d_local'] = False + elif args.boot == 'initd-local': + subs['init_d'] = True + subs['init_d_local'] = True + else: + subs['init_d'] = False + subs['init_d_local'] = False + + if args.boot == 'systemd': + subs['systemd'] = True + else: + subs['systemd'] = False - -def archive_code(): - (stdout, _stderr) = tiny_p([sys.executable, - join(os.getcwd(), 'make-tarball')]) - (revno, version, bname, arc_fn) = stdout.split(None) - return (revno, version, arc_fn) + return templater.render_from_file(tmpl_fn, params=subs) def main(): @@ -230,8 +159,7 @@ def main(): parser.add_argument("-b", "--boot", dest="boot", help="select boot type (default: %(default)s)", metavar="TYPE", default='initd', - choices=('upstart', 'initd', 'systemd', - 'upstart-local', 'initd-local')) + choices=('initd', 'systemd', 'initd-local')) parser.add_argument("-v", "--verbose", dest="verbose", help=("run verbosely" " (default: %(default)s)"), diff --git a/packages/redhat/cloud-init.spec b/packages/redhat/cloud-init.spec index ddb6617d..e9ce087a 100644 --- a/packages/redhat/cloud-init.spec +++ b/packages/redhat/cloud-init.spec @@ -1,5 +1,9 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +# See: See: http://www.zarb.org/~jasonc/macros.php +# Or: http://fedoraproject.org/wiki/Packaging:ScriptletSnippets +# Or: http://www.rpm.org/max-rpm/ch-rpm-inside.html + Name: cloud-init Version: {{version}} Release: {{release}}%{?dist} @@ -10,27 +14,45 @@ License: GPLv3 URL: http://launchpad.net/cloud-init Source0: {{archive_name}} - BuildArch: noarch - BuildRoot: %{_tmppath} +BuildRequires: python-devel +BuildRequires: python-setuptools -{{for r in bd_requires}} -BuildRequires: {{r}} -{{endfor}} +# System util packages needed +Requires: shadow-utils +Requires: rsyslog +Requires: iproute +Requires: e2fsprogs +Requires: net-tools +Requires: procps +Requires: shadow-utils -# Install requirements +# Install pypi 'dynamic' requirements {{for r in requires}} -Requires: {{r}} +Requires: {{r}} {{endfor}} +{{if init_d}} +Requires(post): chkconfig +Requires(postun): initscripts +Requires(preun): chkconfig +Requires(preun): initscripts +{{endif}} + +{{if systemd}} +BuildRequires: systemd-units +Requires(post): systemd-units +Requires(postun): systemd-units +Requires(preun): systemd-units +{{endif}} + %description Cloud-init is a set of init scripts for cloud instances. Cloud instances need special scripts to run during initialization to retrieve and install ssh keys and to let the user run various scripts. - %prep %setup -q -n %{name}-%{version}-{{revno}} @@ -41,32 +63,139 @@ ssh keys and to let the user run various scripts. rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT -# Remove anything after it was installed?? -{{for r in post_remove}} -rm -rfv $RPM_BUILD_ROOT/{{r}} -{{endfor}} +# Note that /etc/rsyslog.d didn't exist by default until F15. +# el6 request: https://bugzilla.redhat.com/show_bug.cgi?id=740420 +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d +cp -p tools/21-cloudinit.conf \ + $RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d/21-cloudinit.conf + +{{if init_d}} +mkdir -p $RPM_BUILD_ROOT/%{_initddir}/ +{{endif}} +{{if init_d_local}} +cp -p initd/cloud-init-local $RPM_BUILD_ROOT/%{_initddir}/ +cp -p initd/cloud-config $RPM_BUILD_ROOT/%{_initddir}/ +cp -p initd/cloud-final $RPM_BUILD_ROOT/%{_initddir}/ +{{elif init_d}} +cp -p initd/cloud-init $RPM_BUILD_ROOT/%{_initddir}/ +cp -p initd/cloud-config $RPM_BUILD_ROOT/%{_initddir}/ +cp -p initd/cloud-final $RPM_BUILD_ROOT/%{_initddir}/ +{{endif}} + +{{if systemd}} +mkdir -p $RPM_BUILD_ROOT/%{_unitdir} +cp -p systemd/* $RPM_BUILD_ROOT/%{_unitdir} +{{endif}} %clean rm -rf $RPM_BUILD_ROOT +%post + +{{if systemd}} +if [ $1 -eq 1 ] +then + /bin/systemctl enable cloud-config.service >/dev/null 2>&1 || : + /bin/systemctl enable cloud-final.service >/dev/null 2>&1 || : + /bin/systemctl enable cloud-init.service >/dev/null 2>&1 || : + /bin/systemctl enable cloud-init-local.service >/dev/null 2>&1 || : +fi +{{endif}} + +{{if init_d_local}} +/sbin/chkconfig --add /etc/rc.d/init.d/cloud-init-local +{{elif init_d}} +/sbin/chkconfig --add /etc/rc.d/init.d/cloud-init +{{endif}} +{{if init_d}} +/sbin/chkconfig --add /etc/rc.d/init.d/cloud-config +/sbin/chkconfig --add /etc/rc.d/init.d/cloud-final +{{endif}} + +%preun + +{{if init_d_local}} +if [ $1 -eq 0 ] +then + /sbin/service cloud-init-local stop >/dev/null 2>&1 + /sbin/chkconfig --del cloud-init-local +fi +{{elif init_d}} +if [ $1 -eq 0 ] +then + /sbin/service cloud-init stop >/dev/null 2>&1 + /sbin/chkconfig --del cloud-init +fi +{{endif}} +{{if init_d}} +if [ $1 -eq 0 ] +then + /sbin/service cloud-config stop >/dev/null 2>&1 + /sbin/chkconfig --del cloud-config + /sbin/service cloud-final stop >/dev/null 2>&1 + /sbin/chkconfig --del cloud-final +fi +{{endif}} + +{{if systemd}} +if [ $1 -eq 0 ] +then + /bin/systemctl --no-reload disable cloud-config.service >/dev/null 2>&1 || : + /bin/systemctl --no-reload disable cloud-final.service >/dev/null 2>&1 || : + /bin/systemctl --no-reload disable cloud-init.service >/dev/null 2>&1 || : + /bin/systemctl --no-reload disable cloud-init-local.service >/dev/null 2>&1 || : +fi +{{endif}} + +%postun + +{{if systemd}} +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +{{endif}} + %files +{{if init_d}} +%attr(0755, root, root) %{_initddir}/cloud-config +%attr(0755, root, root) %{_initddir}/cloud-final +{{endif}} +{{if init_d_local}} +%attr(0755, root, root) %{_initddir}/cloud-init-local +{{elif init_d}} +%attr(0755, root, root) %{_initddir}/cloud-init +{{endif}} + +{{if systemd}} +%{_unitdir}/cloud-config.service +%{_unitdir}/cloud-config.target +%{_unitdir}/cloud-init.service +%{_unitdir}/cloud-init-local.service +%{_unitdir}/cloud-final.service +{{endif}} + +# Program binaries +%{_bindir}/cloud-init* + +# There doesn't seem to be an agreed upon place for these +# although it appears the standard says /usr/lib but rpmbuild +# will try /usr/lib64 ?? +/usr/lib/%{name}/uncloud-init +/usr/lib/%{name}/write-ssh-key-fingerprints + # Docs -{{for r in docs}} -%doc {{r}} -{{endfor}} +%doc TODO LICENSE ChangeLog Requires +%doc %{_defaultdocdir}/cloud-init/* # Configs -{{for r in configs}} -%config(noreplace) %{_sysconfdir}/{{r}} -{{endfor}} - -# Other files -{{for r in files}} -{{r}} -{{endfor}} - -# Python sitelib +%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg +%dir %{_sysconfdir}/cloud/cloud.cfg.d +%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/*.cfg +%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/README +%dir %{_sysconfdir}/cloud/templates +%config(noreplace) %{_sysconfdir}/cloud/templates/* +%config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf + +# Python code is here... %{python_sitelib}/* %changelog diff --git a/setup.py b/setup.py index 810ebb48..d6253384 100755 --- a/setup.py +++ b/setup.py @@ -76,20 +76,12 @@ setuptools.setup(name='cloud-init', data_files=[('/etc/cloud', glob('config/*.cfg')), ('/etc/cloud/cloud.cfg.d', glob('config/cloud.cfg.d/*')), ('/etc/cloud/templates', glob('templates/*')), - # Only really need for upstart based systems - ('/etc/init', glob('upstart/*.conf')), - # Only really need for systemd based systems - ('/etc/systemd/system', glob('systemd/*.service')), - # Only really need for init.d based system - ('/etc/init.d', glob('initd/*')), ('/usr/share/cloud-init', []), ('/usr/lib/cloud-init', ['tools/uncloud-init', 'tools/write-ssh-key-fingerprints']), ('/usr/share/doc/cloud-init', filter(is_f, glob('doc/*'))), ('/usr/share/doc/cloud-init/examples', filter(is_f, glob('doc/examples/*'))), ('/usr/share/doc/cloud-init/examples/seed', filter(is_f, glob('doc/examples/seed/*'))), - # ?? - # ('/etc/profile.d', ['tools/Z99-cloud-locale-test.sh']), ], install_requires=read_requires(), ) -- cgit v1.2.3 From d0665e19efd69eee31344f1a1af212639dda0943 Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Tue, 3 Jul 2012 16:04:58 -0700 Subject: Add the ability to have setup.py have a CLI option that specifies the daemon type which then later affects the installation of certain config files, which then can be extracted during package creation as needed. --- packages/brpm | 1 + packages/redhat/cloud-init.spec | 38 ++++++---------------- setup.py | 72 ++++++++++++++++++++++++++++++++++++++--- 3 files changed, 78 insertions(+), 33 deletions(-) (limited to 'setup.py') diff --git a/packages/brpm b/packages/brpm index 3abd9f15..1212b0e4 100755 --- a/packages/brpm +++ b/packages/brpm @@ -150,6 +150,7 @@ def generate_spec_contents(args, tmpl_fn): else: subs['systemd'] = False + subs['daemon_type'] = args.boot return templater.render_from_file(tmpl_fn, params=subs) diff --git a/packages/redhat/cloud-init.spec b/packages/redhat/cloud-init.spec index e9ce087a..df13bcb7 100644 --- a/packages/redhat/cloud-init.spec +++ b/packages/redhat/cloud-init.spec @@ -1,6 +1,6 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -# See: See: http://www.zarb.org/~jasonc/macros.php +# See: http://www.zarb.org/~jasonc/macros.php # Or: http://fedoraproject.org/wiki/Packaging:ScriptletSnippets # Or: http://www.rpm.org/max-rpm/ch-rpm-inside.html @@ -61,7 +61,9 @@ ssh keys and to let the user run various scripts. %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +%{__python} setup.py install -O1 \ + --skip-build --root $RPM_BUILD_ROOT \ + --daemon-type={{daemon_type}} # Note that /etc/rsyslog.d didn't exist by default until F15. # el6 request: https://bugzilla.redhat.com/show_bug.cgi?id=740420 @@ -69,24 +71,6 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d cp -p tools/21-cloudinit.conf \ $RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d/21-cloudinit.conf -{{if init_d}} -mkdir -p $RPM_BUILD_ROOT/%{_initddir}/ -{{endif}} -{{if init_d_local}} -cp -p initd/cloud-init-local $RPM_BUILD_ROOT/%{_initddir}/ -cp -p initd/cloud-config $RPM_BUILD_ROOT/%{_initddir}/ -cp -p initd/cloud-final $RPM_BUILD_ROOT/%{_initddir}/ -{{elif init_d}} -cp -p initd/cloud-init $RPM_BUILD_ROOT/%{_initddir}/ -cp -p initd/cloud-config $RPM_BUILD_ROOT/%{_initddir}/ -cp -p initd/cloud-final $RPM_BUILD_ROOT/%{_initddir}/ -{{endif}} - -{{if systemd}} -mkdir -p $RPM_BUILD_ROOT/%{_unitdir} -cp -p systemd/* $RPM_BUILD_ROOT/%{_unitdir} -{{endif}} - %clean rm -rf $RPM_BUILD_ROOT @@ -103,13 +87,13 @@ fi {{endif}} {{if init_d_local}} -/sbin/chkconfig --add /etc/rc.d/init.d/cloud-init-local +/sbin/chkconfig --add %{_initrddir}/cloud-init-local {{elif init_d}} -/sbin/chkconfig --add /etc/rc.d/init.d/cloud-init +/sbin/chkconfig --add %{_initrddir}/cloud-init {{endif}} {{if init_d}} -/sbin/chkconfig --add /etc/rc.d/init.d/cloud-config -/sbin/chkconfig --add /etc/rc.d/init.d/cloud-final +/sbin/chkconfig --add %{_initrddir}/cloud-config +/sbin/chkconfig --add %{_initrddir}/cloud-final {{endif}} %preun @@ -166,11 +150,7 @@ fi {{endif}} {{if systemd}} -%{_unitdir}/cloud-config.service -%{_unitdir}/cloud-config.target -%{_unitdir}/cloud-init.service -%{_unitdir}/cloud-init-local.service -%{_unitdir}/cloud-final.service +%{_unitdir}/cloud-* {{endif}} # Program binaries diff --git a/setup.py b/setup.py index d6253384..50e95e9d 100755 --- a/setup.py +++ b/setup.py @@ -26,10 +26,45 @@ import os import re import setuptools +from setuptools.command.install import install + +from distutils.command.install_data import install_data +from distutils.errors import DistutilsArgError import subprocess +def is_f(p): + return os.path.isfile(p) + + +DAEMON_FILES = { + 'initd': filter((lambda x: is_f(x) + and x.find('local') == -1), glob('initd/*')), + 'initd-local': filter((lambda x: is_f(x) + and not x.endswith('cloud-init')), glob('initd/*')), + 'systemd': filter((lambda x: is_f(x)), glob('systemd/*')), + 'upstart': filter((lambda x: is_f(x) + and x.find('local') == -1 + and x.find('nonet') == -1), glob('upstart/*')), + 'upstart-nonet': filter((lambda x: is_f(x) + and x.find('local') == -1 + and not x.endswith('cloud-init.conf')), glob('upstart/*')), + 'upstart-local': filter((lambda x: is_f(x) + and x.find('nonet') == -1 + and not x.endswith('cloud-init.conf')), glob('upstart/*')), +} +DAEMON_ROOTS = { + 'initd': '/etc/rc.d/init.d', + 'initd-local': '/etc/rc.d/init.d', + 'systemd': '/etc/systemd/system/', + 'upstart': '/etc/init/', + 'upstart-nonet': '/etc/init/', + 'upstart-local': '/etc/init/', +} +DAEMON_TYPES = sorted(list(DAEMON_ROOTS.keys())) + + def tiny_p(cmd, capture=True): # Darn python 2.6 doesn't have check_output (argggg) stdout = subprocess.PIPE @@ -46,10 +81,6 @@ def tiny_p(cmd, capture=True): return (out, err) -def is_f(p): - return os.path.isfile(p) - - def get_version(): cmd = ['tools/read-version'] (ver, _e) = tiny_p(cmd) @@ -62,6 +93,34 @@ def read_requires(): return deps.splitlines() +# TODO: Is there a better way to do this?? +class DaemonInstallData(install): + user_options = install.user_options + [ + # This will magically show up in member variable 'daemon_type' + ('daemon-type=', None, + ('daemon type to configure (%s) [default: None]') % + (", ".join(DAEMON_TYPES)) + ), + ] + + def initialize_options(self): + install.initialize_options(self) + self.daemon_type = None + + def finalize_options(self): + install.finalize_options(self) + if self.daemon_type and self.daemon_type not in DAEMON_TYPES: + raise DistutilsArgError( + ("You must specify one of (%s) when" + " specifying a daemon type!") % (", ".join(DAEMON_TYPES)) + ) + elif self.daemon_type: + self.distribution.data_files.append((DAEMON_ROOTS[self.daemon_type], + DAEMON_FILES[self.daemon_type])) + # Force that command to reinitalize (with new file list) + self.distribution.reinitialize_command('install_data', True) + + setuptools.setup(name='cloud-init', version=get_version(), description='EC2 initialisation magic', @@ -84,4 +143,9 @@ setuptools.setup(name='cloud-init', ('/usr/share/doc/cloud-init/examples/seed', filter(is_f, glob('doc/examples/seed/*'))), ], install_requires=read_requires(), + cmdclass = { + # Use a subclass for install that handles + # adding on the right daemon configuration files + 'install': DaemonInstallData, + }, ) -- cgit v1.2.3 From 95711130af22f1d597aa0ab6b5a39d0af16f8a28 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Fri, 6 Jul 2012 17:03:11 -0400 Subject: setup.py: rename "daemon type" to "init system" This brings with it other changes, and also makes an install install all of the requisite init files. (ie, cloud-init needs the -local and the non-local) --- initd/cloud-config | 124 ---------------------------------------- initd/cloud-final | 124 ---------------------------------------- initd/cloud-init | 124 ---------------------------------------- initd/cloud-init-local | 124 ---------------------------------------- packages/bddeb | 4 +- packages/brpm | 2 +- packages/debian/rules | 2 +- packages/redhat/cloud-init.spec | 2 +- setup.py | 52 ++++++----------- sysvinit/cloud-config | 124 ++++++++++++++++++++++++++++++++++++++++ sysvinit/cloud-final | 124 ++++++++++++++++++++++++++++++++++++++++ sysvinit/cloud-init | 124 ++++++++++++++++++++++++++++++++++++++++ sysvinit/cloud-init-local | 124 ++++++++++++++++++++++++++++++++++++++++ 13 files changed, 520 insertions(+), 534 deletions(-) delete mode 100755 initd/cloud-config delete mode 100755 initd/cloud-final delete mode 100755 initd/cloud-init delete mode 100755 initd/cloud-init-local create mode 100755 sysvinit/cloud-config create mode 100755 sysvinit/cloud-final create mode 100755 sysvinit/cloud-init create mode 100755 sysvinit/cloud-init-local (limited to 'setup.py') diff --git a/initd/cloud-config b/initd/cloud-config deleted file mode 100755 index dd0bca8b..00000000 --- a/initd/cloud-config +++ /dev/null @@ -1,124 +0,0 @@ -#!/bin/sh - -# -# Copyright (C) 2012 Yahoo! Inc. -# -# 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 . -# - -# See: http://wiki.debian.org/LSBInitScripts -# See: http://tiny.cc/czvbgw -# See: http://www.novell.com/coolsolutions/feature/15380.html -# Also based on dhcpd in RHEL (for comparison) - -### BEGIN INIT INFO -# Provides: cloud-config -# Required-Start: cloud-init -# Should-Start: $time -# Required-Stop: -# Should-Stop: -# Default-Start: 3 5 -# Default-Stop: -# Short-Description: The config cloud-init job -# Description: Start cloud-init and runs the config phase -# and any associated config modules as desired. -### END INIT INFO - -. /etc/init.d/functions - -# Return values acc. to LSB for all commands but status: -# 0 - success -# 1 - generic or unspecified error -# 2 - invalid or excess argument(s) -# 3 - unimplemented feature (e.g. "reload") -# 4 - user had insufficient privileges -# 5 - program is not installed -# 6 - program is not configured -# 7 - program is not running -# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) -# -# Note that starting an already running service, stopping -# or restarting a not-running service as well as the restart -# with force-reload (in case signaling is not supported) are -# considered a success. - -RETVAL=0 - -prog="cloud-init" -cloud_init="/usr/bin/cloud-init" -conf="/etc/cloud/cloud.cfg" - -# If there exists a sysconfig variable override file use it... -[ -f /etc/sysconfig/cloud-init ] && . /etc/sysconfig/cloud-init - -start() { - [ -x $cloud_init ] || return 5 - [ -f $conf ] || return 6 - - echo -n $"Starting $prog: " - $cloud_init $CLOUDINITARGS modules --mode config - RETVAL=$? - return $RETVAL -} - -stop() { - echo -n $"Shutting down $prog: " - # No-op - RETVAL=7 - return $RETVAL -} - -. /etc/init.d/functions - -case "$1" in - start) - start - RETVAL=$? - ;; - stop) - stop - RETVAL=$? - ;; - restart|try-restart|condrestart) - ## Stop the service and regardless of whether it was - ## running or not, start it again. - # - ## Note: try-restart is now part of LSB (as of 1.9). - ## RH has a similar command named condrestart. - start - RETVAL=$? - ;; - reload|force-reload) - # It does not support reload - RETVAL=3 - ;; - status) - echo -n $"Checking for service $prog:" - # Return value is slightly different for the status command: - # 0 - service up and running - # 1 - service dead, but /var/run/ pid file exists - # 2 - service dead, but /var/lock/ lock file exists - # 3 - service not running (unused) - # 4 - service status unknown :-( - # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) - RETVAL=3 - ;; - *) - echo "Usage: $0 {start|stop|status|try-restart|condrestart|restart|force-reload|reload}" - RETVAL=3 - ;; -esac - -exit $RETVAL diff --git a/initd/cloud-final b/initd/cloud-final deleted file mode 100755 index 2e462c17..00000000 --- a/initd/cloud-final +++ /dev/null @@ -1,124 +0,0 @@ -#!/bin/sh - -# -# Copyright (C) 2012 Yahoo! Inc. -# -# 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 . -# - -# See: http://wiki.debian.org/LSBInitScripts -# See: http://tiny.cc/czvbgw -# See: http://www.novell.com/coolsolutions/feature/15380.html -# Also based on dhcpd in RHEL (for comparison) - -### BEGIN INIT INFO -# Provides: cloud-final -# Required-Start: $all cloud-init cloud-config -# Should-Start: $time -# Required-Stop: -# Should-Stop: -# Default-Start: 3 5 -# Default-Stop: -# Short-Description: The final cloud-init job -# Description: Start cloud-init and runs the final phase -# and any associated final modules as desired. -### END INIT INFO - -. /etc/init.d/functions - -# Return values acc. to LSB for all commands but status: -# 0 - success -# 1 - generic or unspecified error -# 2 - invalid or excess argument(s) -# 3 - unimplemented feature (e.g. "reload") -# 4 - user had insufficient privileges -# 5 - program is not installed -# 6 - program is not configured -# 7 - program is not running -# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) -# -# Note that starting an already running service, stopping -# or restarting a not-running service as well as the restart -# with force-reload (in case signaling is not supported) are -# considered a success. - -RETVAL=0 - -prog="cloud-init" -cloud_init="/usr/bin/cloud-init" -conf="/etc/cloud/cloud.cfg" - -# If there exists a sysconfig variable override file use it... -[ -f /etc/sysconfig/cloud-init ] && . /etc/sysconfig/cloud-init - -start() { - [ -x $cloud_init ] || return 5 - [ -f $conf ] || return 6 - - echo -n $"Starting $prog: " - $cloud_init $CLOUDINITARGS modules --mode final - RETVAL=$? - return $RETVAL -} - -stop() { - echo -n $"Shutting down $prog: " - # No-op - RETVAL=7 - return $RETVAL -} - -. /etc/init.d/functions - -case "$1" in - start) - start - RETVAL=$? - ;; - stop) - stop - RETVAL=$? - ;; - restart|try-restart|condrestart) - ## Stop the service and regardless of whether it was - ## running or not, start it again. - # - ## Note: try-restart is now part of LSB (as of 1.9). - ## RH has a similar command named condrestart. - start - RETVAL=$? - ;; - reload|force-reload) - # It does not support reload - RETVAL=3 - ;; - status) - echo -n $"Checking for service $prog:" - # Return value is slightly different for the status command: - # 0 - service up and running - # 1 - service dead, but /var/run/ pid file exists - # 2 - service dead, but /var/lock/ lock file exists - # 3 - service not running (unused) - # 4 - service status unknown :-( - # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) - RETVAL=3 - ;; - *) - echo "Usage: $0 {start|stop|status|try-restart|condrestart|restart|force-reload|reload}" - RETVAL=3 - ;; -esac - -exit $RETVAL diff --git a/initd/cloud-init b/initd/cloud-init deleted file mode 100755 index 7726c452..00000000 --- a/initd/cloud-init +++ /dev/null @@ -1,124 +0,0 @@ -#!/bin/sh - -# -# Copyright (C) 2012 Yahoo! Inc. -# -# 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 . -# - -# See: http://wiki.debian.org/LSBInitScripts -# See: http://tiny.cc/czvbgw -# See: http://www.novell.com/coolsolutions/feature/15380.html -# Also based on dhcpd in RHEL (for comparison) - -### BEGIN INIT INFO -# Provides: cloud-init -# Required-Start: $local_fs $network $named $remote_fs -# Should-Start: $time -# Required-Stop: -# Should-Stop: -# Default-Start: 3 5 -# Default-Stop: -# Short-Description: The initial cloud-init job (net and fs contingent) -# Description: Start cloud-init and runs the initialization phase -# and any associated initial modules as desired. -### END INIT INFO - -. /etc/init.d/functions - -# Return values acc. to LSB for all commands but status: -# 0 - success -# 1 - generic or unspecified error -# 2 - invalid or excess argument(s) -# 3 - unimplemented feature (e.g. "reload") -# 4 - user had insufficient privileges -# 5 - program is not installed -# 6 - program is not configured -# 7 - program is not running -# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) -# -# Note that starting an already running service, stopping -# or restarting a not-running service as well as the restart -# with force-reload (in case signaling is not supported) are -# considered a success. - -RETVAL=0 - -prog="cloud-init" -cloud_init="/usr/bin/cloud-init" -conf="/etc/cloud/cloud.cfg" - -# If there exists a sysconfig variable override file use it... -[ -f /etc/sysconfig/cloud-init ] && . /etc/sysconfig/cloud-init - -start() { - [ -x $cloud_init ] || return 5 - [ -f $conf ] || return 6 - - echo -n $"Starting $prog: " - $cloud_init $CLOUDINITARGS init - RETVAL=$? - return $RETVAL -} - -stop() { - echo -n $"Shutting down $prog: " - # No-op - RETVAL=7 - return $RETVAL -} - -. /etc/init.d/functions - -case "$1" in - start) - start - RETVAL=$? - ;; - stop) - stop - RETVAL=$? - ;; - restart|try-restart|condrestart) - ## Stop the service and regardless of whether it was - ## running or not, start it again. - # - ## Note: try-restart is now part of LSB (as of 1.9). - ## RH has a similar command named condrestart. - start - RETVAL=$? - ;; - reload|force-reload) - # It does not support reload - RETVAL=3 - ;; - status) - echo -n $"Checking for service $prog:" - # Return value is slightly different for the status command: - # 0 - service up and running - # 1 - service dead, but /var/run/ pid file exists - # 2 - service dead, but /var/lock/ lock file exists - # 3 - service not running (unused) - # 4 - service status unknown :-( - # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) - RETVAL=3 - ;; - *) - echo "Usage: $0 {start|stop|status|try-restart|condrestart|restart|force-reload|reload}" - RETVAL=3 - ;; -esac - -exit $RETVAL diff --git a/initd/cloud-init-local b/initd/cloud-init-local deleted file mode 100755 index bf5d409a..00000000 --- a/initd/cloud-init-local +++ /dev/null @@ -1,124 +0,0 @@ -#!/bin/sh - -# -# Copyright (C) 2012 Yahoo! Inc. -# -# 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 . -# - -# See: http://wiki.debian.org/LSBInitScripts -# See: http://tiny.cc/czvbgw -# See: http://www.novell.com/coolsolutions/feature/15380.html -# Also based on dhcpd in RHEL (for comparison) - -### BEGIN INIT INFO -# Provides: cloud-init -# Required-Start: $local_fs $remote_fs -# Should-Start: $time -# Required-Stop: -# Should-Stop: -# Default-Start: 3 5 -# Default-Stop: -# Short-Description: The initial cloud-init job (local fs contingent) -# Description: Start cloud-init and runs the initialization phases -# and any associated initial modules as desired. -### END INIT INFO - -. /etc/init.d/functions - -# Return values acc. to LSB for all commands but status: -# 0 - success -# 1 - generic or unspecified error -# 2 - invalid or excess argument(s) -# 3 - unimplemented feature (e.g. "reload") -# 4 - user had insufficient privileges -# 5 - program is not installed -# 6 - program is not configured -# 7 - program is not running -# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) -# -# Note that starting an already running service, stopping -# or restarting a not-running service as well as the restart -# with force-reload (in case signaling is not supported) are -# considered a success. - -RETVAL=0 - -prog="cloud-init" -cloud_init="/usr/bin/cloud-init" -conf="/etc/cloud/cloud.cfg" - -# If there exists a sysconfig variable override file use it... -[ -f /etc/sysconfig/cloud-init ] && . /etc/sysconfig/cloud-init - -start() { - [ -x $cloud_init ] || return 5 - [ -f $conf ] || return 6 - - echo -n $"Starting $prog: " - $cloud_init $CLOUDINITARGS init --local - RETVAL=$? - return $RETVAL -} - -stop() { - echo -n $"Shutting down $prog: " - # No-op - RETVAL=7 - return $RETVAL -} - -. /etc/init.d/functions - -case "$1" in - start) - start - RETVAL=$? - ;; - stop) - stop - RETVAL=$? - ;; - restart|try-restart|condrestart) - ## Stop the service and regardless of whether it was - ## running or not, start it again. - # - ## Note: try-restart is now part of LSB (as of 1.9). - ## RH has a similar command named condrestart. - start - RETVAL=$? - ;; - reload|force-reload) - # It does not support reload - RETVAL=3 - ;; - status) - echo -n $"Checking for service $prog:" - # Return value is slightly different for the status command: - # 0 - service up and running - # 1 - service dead, but /var/run/ pid file exists - # 2 - service dead, but /var/lock/ lock file exists - # 3 - service not running (unused) - # 4 - service status unknown :-( - # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) - RETVAL=3 - ;; - *) - echo "Usage: $0 {start|stop|status|try-restart|condrestart|restart|force-reload|reload}" - RETVAL=3 - ;; -esac - -exit $RETVAL diff --git a/packages/bddeb b/packages/bddeb index b5a70dd8..10ad08b3 100755 --- a/packages/bddeb +++ b/packages/bddeb @@ -29,7 +29,7 @@ PKG_MP = { } -def write_debian_folder(root, version, revno, daemon_type): +def write_debian_folder(root, version, revno, init_sys): deb_dir = util.abs_join(root, 'debian') os.makedirs(deb_dir) @@ -67,7 +67,7 @@ def write_debian_folder(root, version, revno, daemon_type): templater.render_to_file(util.abs_join('debian', 'rules'), util.abs_join(deb_dir, 'rules'), - params={'daemon_type': daemon_type}) + params={'init_sys': init_sys}) # Just copy the following directly for base_fn in ['dirs', 'copyright', 'compat', 'pycompat']: diff --git a/packages/brpm b/packages/brpm index 1212b0e4..1d05bd2a 100755 --- a/packages/brpm +++ b/packages/brpm @@ -150,7 +150,7 @@ def generate_spec_contents(args, tmpl_fn): else: subs['systemd'] = False - subs['daemon_type'] = args.boot + subs['init_sys'] = args.boot return templater.render_from_file(tmpl_fn, params=subs) diff --git a/packages/debian/rules b/packages/debian/rules index 6814974f..87cd6538 100755 --- a/packages/debian/rules +++ b/packages/debian/rules @@ -7,7 +7,7 @@ binary-install/cloud-init::cloud-init-fixups include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/python-distutils.mk -DEB_PYTHON_INSTALL_ARGS_ALL += --daemon-type={{daemon_type}} +DEB_PYTHON_INSTALL_ARGS_ALL += --init-system={{init_sys}} DEB_DH_INSTALL_SOURCEDIR := debian/tmp diff --git a/packages/redhat/cloud-init.spec b/packages/redhat/cloud-init.spec index df13bcb7..d0f83a4b 100644 --- a/packages/redhat/cloud-init.spec +++ b/packages/redhat/cloud-init.spec @@ -63,7 +63,7 @@ ssh keys and to let the user run various scripts. rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 \ --skip-build --root $RPM_BUILD_ROOT \ - --daemon-type={{daemon_type}} + --init-system={{init_sys}} # Note that /etc/rsyslog.d didn't exist by default until F15. # el6 request: https://bugzilla.redhat.com/show_bug.cgi?id=740420 diff --git a/setup.py b/setup.py index 50e95e9d..458d1a9e 100755 --- a/setup.py +++ b/setup.py @@ -38,31 +38,17 @@ def is_f(p): return os.path.isfile(p) -DAEMON_FILES = { - 'initd': filter((lambda x: is_f(x) - and x.find('local') == -1), glob('initd/*')), - 'initd-local': filter((lambda x: is_f(x) - and not x.endswith('cloud-init')), glob('initd/*')), +INITSYS_FILES = { + 'sysvinit': filter((lambda x: is_f(x)), glob('sysvinit/*')), 'systemd': filter((lambda x: is_f(x)), glob('systemd/*')), - 'upstart': filter((lambda x: is_f(x) - and x.find('local') == -1 - and x.find('nonet') == -1), glob('upstart/*')), - 'upstart-nonet': filter((lambda x: is_f(x) - and x.find('local') == -1 - and not x.endswith('cloud-init.conf')), glob('upstart/*')), - 'upstart-local': filter((lambda x: is_f(x) - and x.find('nonet') == -1 - and not x.endswith('cloud-init.conf')), glob('upstart/*')), + 'upstart': filter((lambda x: is_f(x)), glob('upstart/*')), } -DAEMON_ROOTS = { - 'initd': '/etc/rc.d/init.d', - 'initd-local': '/etc/rc.d/init.d', +INITSYS_ROOTS = { + 'sysvinit': '/etc/rc.d/init.d', 'systemd': '/etc/systemd/system/', 'upstart': '/etc/init/', - 'upstart-nonet': '/etc/init/', - 'upstart-local': '/etc/init/', } -DAEMON_TYPES = sorted(list(DAEMON_ROOTS.keys())) +INITSYS_TYPES = sorted(list(INITSYS_ROOTS.keys())) def tiny_p(cmd, capture=True): @@ -94,29 +80,29 @@ def read_requires(): # TODO: Is there a better way to do this?? -class DaemonInstallData(install): +class InitsysInstallData(install): user_options = install.user_options + [ - # This will magically show up in member variable 'daemon_type' - ('daemon-type=', None, - ('daemon type to configure (%s) [default: None]') % - (", ".join(DAEMON_TYPES)) + # This will magically show up in member variable 'init_sys' + ('init-system=', None, + ('init system to configure (%s) [default: None]') % + (", ".join(INITSYS_TYPES)) ), ] def initialize_options(self): install.initialize_options(self) - self.daemon_type = None + self.initsys = None def finalize_options(self): install.finalize_options(self) - if self.daemon_type and self.daemon_type not in DAEMON_TYPES: + if self.initsys and self.initsys not in INITSYS_TYPES: raise DistutilsArgError( ("You must specify one of (%s) when" - " specifying a daemon type!") % (", ".join(DAEMON_TYPES)) + " specifying a init system!") % (", ".join(INITSYS_TYPES)) ) - elif self.daemon_type: - self.distribution.data_files.append((DAEMON_ROOTS[self.daemon_type], - DAEMON_FILES[self.daemon_type])) + elif self.initsys: + self.distribution.data_files.append((INITSYS_ROOTS[self.initsys], + INITSYS_FILES[self.initsys])) # Force that command to reinitalize (with new file list) self.distribution.reinitialize_command('install_data', True) @@ -145,7 +131,7 @@ setuptools.setup(name='cloud-init', install_requires=read_requires(), cmdclass = { # Use a subclass for install that handles - # adding on the right daemon configuration files - 'install': DaemonInstallData, + # adding on the right init system configuration files + 'install': InitsysInstallData, }, ) diff --git a/sysvinit/cloud-config b/sysvinit/cloud-config new file mode 100755 index 00000000..dd0bca8b --- /dev/null +++ b/sysvinit/cloud-config @@ -0,0 +1,124 @@ +#!/bin/sh + +# +# Copyright (C) 2012 Yahoo! Inc. +# +# 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 . +# + +# See: http://wiki.debian.org/LSBInitScripts +# See: http://tiny.cc/czvbgw +# See: http://www.novell.com/coolsolutions/feature/15380.html +# Also based on dhcpd in RHEL (for comparison) + +### BEGIN INIT INFO +# Provides: cloud-config +# Required-Start: cloud-init +# Should-Start: $time +# Required-Stop: +# Should-Stop: +# Default-Start: 3 5 +# Default-Stop: +# Short-Description: The config cloud-init job +# Description: Start cloud-init and runs the config phase +# and any associated config modules as desired. +### END INIT INFO + +. /etc/init.d/functions + +# Return values acc. to LSB for all commands but status: +# 0 - success +# 1 - generic or unspecified error +# 2 - invalid or excess argument(s) +# 3 - unimplemented feature (e.g. "reload") +# 4 - user had insufficient privileges +# 5 - program is not installed +# 6 - program is not configured +# 7 - program is not running +# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) +# +# Note that starting an already running service, stopping +# or restarting a not-running service as well as the restart +# with force-reload (in case signaling is not supported) are +# considered a success. + +RETVAL=0 + +prog="cloud-init" +cloud_init="/usr/bin/cloud-init" +conf="/etc/cloud/cloud.cfg" + +# If there exists a sysconfig variable override file use it... +[ -f /etc/sysconfig/cloud-init ] && . /etc/sysconfig/cloud-init + +start() { + [ -x $cloud_init ] || return 5 + [ -f $conf ] || return 6 + + echo -n $"Starting $prog: " + $cloud_init $CLOUDINITARGS modules --mode config + RETVAL=$? + return $RETVAL +} + +stop() { + echo -n $"Shutting down $prog: " + # No-op + RETVAL=7 + return $RETVAL +} + +. /etc/init.d/functions + +case "$1" in + start) + start + RETVAL=$? + ;; + stop) + stop + RETVAL=$? + ;; + restart|try-restart|condrestart) + ## Stop the service and regardless of whether it was + ## running or not, start it again. + # + ## Note: try-restart is now part of LSB (as of 1.9). + ## RH has a similar command named condrestart. + start + RETVAL=$? + ;; + reload|force-reload) + # It does not support reload + RETVAL=3 + ;; + status) + echo -n $"Checking for service $prog:" + # Return value is slightly different for the status command: + # 0 - service up and running + # 1 - service dead, but /var/run/ pid file exists + # 2 - service dead, but /var/lock/ lock file exists + # 3 - service not running (unused) + # 4 - service status unknown :-( + # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) + RETVAL=3 + ;; + *) + echo "Usage: $0 {start|stop|status|try-restart|condrestart|restart|force-reload|reload}" + RETVAL=3 + ;; +esac + +exit $RETVAL diff --git a/sysvinit/cloud-final b/sysvinit/cloud-final new file mode 100755 index 00000000..2e462c17 --- /dev/null +++ b/sysvinit/cloud-final @@ -0,0 +1,124 @@ +#!/bin/sh + +# +# Copyright (C) 2012 Yahoo! Inc. +# +# 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 . +# + +# See: http://wiki.debian.org/LSBInitScripts +# See: http://tiny.cc/czvbgw +# See: http://www.novell.com/coolsolutions/feature/15380.html +# Also based on dhcpd in RHEL (for comparison) + +### BEGIN INIT INFO +# Provides: cloud-final +# Required-Start: $all cloud-init cloud-config +# Should-Start: $time +# Required-Stop: +# Should-Stop: +# Default-Start: 3 5 +# Default-Stop: +# Short-Description: The final cloud-init job +# Description: Start cloud-init and runs the final phase +# and any associated final modules as desired. +### END INIT INFO + +. /etc/init.d/functions + +# Return values acc. to LSB for all commands but status: +# 0 - success +# 1 - generic or unspecified error +# 2 - invalid or excess argument(s) +# 3 - unimplemented feature (e.g. "reload") +# 4 - user had insufficient privileges +# 5 - program is not installed +# 6 - program is not configured +# 7 - program is not running +# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) +# +# Note that starting an already running service, stopping +# or restarting a not-running service as well as the restart +# with force-reload (in case signaling is not supported) are +# considered a success. + +RETVAL=0 + +prog="cloud-init" +cloud_init="/usr/bin/cloud-init" +conf="/etc/cloud/cloud.cfg" + +# If there exists a sysconfig variable override file use it... +[ -f /etc/sysconfig/cloud-init ] && . /etc/sysconfig/cloud-init + +start() { + [ -x $cloud_init ] || return 5 + [ -f $conf ] || return 6 + + echo -n $"Starting $prog: " + $cloud_init $CLOUDINITARGS modules --mode final + RETVAL=$? + return $RETVAL +} + +stop() { + echo -n $"Shutting down $prog: " + # No-op + RETVAL=7 + return $RETVAL +} + +. /etc/init.d/functions + +case "$1" in + start) + start + RETVAL=$? + ;; + stop) + stop + RETVAL=$? + ;; + restart|try-restart|condrestart) + ## Stop the service and regardless of whether it was + ## running or not, start it again. + # + ## Note: try-restart is now part of LSB (as of 1.9). + ## RH has a similar command named condrestart. + start + RETVAL=$? + ;; + reload|force-reload) + # It does not support reload + RETVAL=3 + ;; + status) + echo -n $"Checking for service $prog:" + # Return value is slightly different for the status command: + # 0 - service up and running + # 1 - service dead, but /var/run/ pid file exists + # 2 - service dead, but /var/lock/ lock file exists + # 3 - service not running (unused) + # 4 - service status unknown :-( + # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) + RETVAL=3 + ;; + *) + echo "Usage: $0 {start|stop|status|try-restart|condrestart|restart|force-reload|reload}" + RETVAL=3 + ;; +esac + +exit $RETVAL diff --git a/sysvinit/cloud-init b/sysvinit/cloud-init new file mode 100755 index 00000000..7726c452 --- /dev/null +++ b/sysvinit/cloud-init @@ -0,0 +1,124 @@ +#!/bin/sh + +# +# Copyright (C) 2012 Yahoo! Inc. +# +# 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 . +# + +# See: http://wiki.debian.org/LSBInitScripts +# See: http://tiny.cc/czvbgw +# See: http://www.novell.com/coolsolutions/feature/15380.html +# Also based on dhcpd in RHEL (for comparison) + +### BEGIN INIT INFO +# Provides: cloud-init +# Required-Start: $local_fs $network $named $remote_fs +# Should-Start: $time +# Required-Stop: +# Should-Stop: +# Default-Start: 3 5 +# Default-Stop: +# Short-Description: The initial cloud-init job (net and fs contingent) +# Description: Start cloud-init and runs the initialization phase +# and any associated initial modules as desired. +### END INIT INFO + +. /etc/init.d/functions + +# Return values acc. to LSB for all commands but status: +# 0 - success +# 1 - generic or unspecified error +# 2 - invalid or excess argument(s) +# 3 - unimplemented feature (e.g. "reload") +# 4 - user had insufficient privileges +# 5 - program is not installed +# 6 - program is not configured +# 7 - program is not running +# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) +# +# Note that starting an already running service, stopping +# or restarting a not-running service as well as the restart +# with force-reload (in case signaling is not supported) are +# considered a success. + +RETVAL=0 + +prog="cloud-init" +cloud_init="/usr/bin/cloud-init" +conf="/etc/cloud/cloud.cfg" + +# If there exists a sysconfig variable override file use it... +[ -f /etc/sysconfig/cloud-init ] && . /etc/sysconfig/cloud-init + +start() { + [ -x $cloud_init ] || return 5 + [ -f $conf ] || return 6 + + echo -n $"Starting $prog: " + $cloud_init $CLOUDINITARGS init + RETVAL=$? + return $RETVAL +} + +stop() { + echo -n $"Shutting down $prog: " + # No-op + RETVAL=7 + return $RETVAL +} + +. /etc/init.d/functions + +case "$1" in + start) + start + RETVAL=$? + ;; + stop) + stop + RETVAL=$? + ;; + restart|try-restart|condrestart) + ## Stop the service and regardless of whether it was + ## running or not, start it again. + # + ## Note: try-restart is now part of LSB (as of 1.9). + ## RH has a similar command named condrestart. + start + RETVAL=$? + ;; + reload|force-reload) + # It does not support reload + RETVAL=3 + ;; + status) + echo -n $"Checking for service $prog:" + # Return value is slightly different for the status command: + # 0 - service up and running + # 1 - service dead, but /var/run/ pid file exists + # 2 - service dead, but /var/lock/ lock file exists + # 3 - service not running (unused) + # 4 - service status unknown :-( + # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) + RETVAL=3 + ;; + *) + echo "Usage: $0 {start|stop|status|try-restart|condrestart|restart|force-reload|reload}" + RETVAL=3 + ;; +esac + +exit $RETVAL diff --git a/sysvinit/cloud-init-local b/sysvinit/cloud-init-local new file mode 100755 index 00000000..bf5d409a --- /dev/null +++ b/sysvinit/cloud-init-local @@ -0,0 +1,124 @@ +#!/bin/sh + +# +# Copyright (C) 2012 Yahoo! Inc. +# +# 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 . +# + +# See: http://wiki.debian.org/LSBInitScripts +# See: http://tiny.cc/czvbgw +# See: http://www.novell.com/coolsolutions/feature/15380.html +# Also based on dhcpd in RHEL (for comparison) + +### BEGIN INIT INFO +# Provides: cloud-init +# Required-Start: $local_fs $remote_fs +# Should-Start: $time +# Required-Stop: +# Should-Stop: +# Default-Start: 3 5 +# Default-Stop: +# Short-Description: The initial cloud-init job (local fs contingent) +# Description: Start cloud-init and runs the initialization phases +# and any associated initial modules as desired. +### END INIT INFO + +. /etc/init.d/functions + +# Return values acc. to LSB for all commands but status: +# 0 - success +# 1 - generic or unspecified error +# 2 - invalid or excess argument(s) +# 3 - unimplemented feature (e.g. "reload") +# 4 - user had insufficient privileges +# 5 - program is not installed +# 6 - program is not configured +# 7 - program is not running +# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) +# +# Note that starting an already running service, stopping +# or restarting a not-running service as well as the restart +# with force-reload (in case signaling is not supported) are +# considered a success. + +RETVAL=0 + +prog="cloud-init" +cloud_init="/usr/bin/cloud-init" +conf="/etc/cloud/cloud.cfg" + +# If there exists a sysconfig variable override file use it... +[ -f /etc/sysconfig/cloud-init ] && . /etc/sysconfig/cloud-init + +start() { + [ -x $cloud_init ] || return 5 + [ -f $conf ] || return 6 + + echo -n $"Starting $prog: " + $cloud_init $CLOUDINITARGS init --local + RETVAL=$? + return $RETVAL +} + +stop() { + echo -n $"Shutting down $prog: " + # No-op + RETVAL=7 + return $RETVAL +} + +. /etc/init.d/functions + +case "$1" in + start) + start + RETVAL=$? + ;; + stop) + stop + RETVAL=$? + ;; + restart|try-restart|condrestart) + ## Stop the service and regardless of whether it was + ## running or not, start it again. + # + ## Note: try-restart is now part of LSB (as of 1.9). + ## RH has a similar command named condrestart. + start + RETVAL=$? + ;; + reload|force-reload) + # It does not support reload + RETVAL=3 + ;; + status) + echo -n $"Checking for service $prog:" + # Return value is slightly different for the status command: + # 0 - service up and running + # 1 - service dead, but /var/run/ pid file exists + # 2 - service dead, but /var/lock/ lock file exists + # 3 - service not running (unused) + # 4 - service status unknown :-( + # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) + RETVAL=3 + ;; + *) + echo "Usage: $0 {start|stop|status|try-restart|condrestart|restart|force-reload|reload}" + RETVAL=3 + ;; +esac + +exit $RETVAL -- cgit v1.2.3 From e7095a1b19e849c530650d2d71edf8b28d30f1d1 Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Fri, 6 Jul 2012 14:13:19 -0700 Subject: Fix the initsys variable, setuptools/distools will automatically assign to a variable of the name 'init_system' instead due to the param name being 'init-system'. --- setup.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 458d1a9e..06b897a5 100755 --- a/setup.py +++ b/setup.py @@ -91,18 +91,18 @@ class InitsysInstallData(install): def initialize_options(self): install.initialize_options(self) - self.initsys = None + self.init_system = None def finalize_options(self): install.finalize_options(self) - if self.initsys and self.initsys not in INITSYS_TYPES: + if self.init_system and self.init_system not in INITSYS_TYPES: raise DistutilsArgError( ("You must specify one of (%s) when" " specifying a init system!") % (", ".join(INITSYS_TYPES)) ) - elif self.initsys: - self.distribution.data_files.append((INITSYS_ROOTS[self.initsys], - INITSYS_FILES[self.initsys])) + elif self.init_system: + self.distribution.data_files.append((INITSYS_ROOTS[self.init_system], + INITSYS_FILES[self.init_system])) # Force that command to reinitalize (with new file list) self.distribution.reinitialize_command('install_data', True) -- cgit v1.2.3