[cloud-init/el6] Upgrade to 0.7.4
Sam Kottler
skottler at fedoraproject.org
Wed Jan 22 16:53:39 UTC 2014
commit 9d9330311a844ab35cfad5176cbc3fd528c50d02
Author: Sam Kottler <shk at redhat.com>
Date: Wed Jan 22 16:49:37 2014 +0000
Upgrade to 0.7.4
.gitignore | 2 +
cloud-init-0.6.3-ext4.patch | 12 -
cloud-init-0.6.3-fedora.patch | 28 --
cloud-init-0.6.3-fqdn.patch | 11 -
cloud-init-0.6.3-ip-based-hostname.patch | 13 -
cloud-init-0.6.3-lp970071.patch | 11 -
cloud-init-0.6.3-no-runparts.patch | 32 --
cloud-init-0.6.3-subprocess-2.6.patch | 61 ----
cloud-init-0.6.3-sysv.patch | 405 --------------------------
cloud-init-0.6.3-use-python2.6.patch | 48 ---
cloud-init-0.6.3-yum.patch | 79 -----
cloud-init-0.7.2-fedora.patch | 33 ++
cloud-init-README.fedora | 9 +-
cloud-init-fedora.cfg => cloud-init-rhel.cfg | 25 ++-
cloud-init-sr1-bzr821.patch | 24 ++
cloud-init.spec | 89 +++----
sources | 2 +-
17 files changed, 120 insertions(+), 764 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2e9cb5e..a50d610 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
/cloud-init-0.6.3-bzr532.tar.gz
+/cloud-init-0.7.2.tar.gz
+/cloud-init-0.7.4.tar.gz
diff --git a/cloud-init-0.7.2-fedora.patch b/cloud-init-0.7.2-fedora.patch
new file mode 100644
index 0000000..9938c77
--- /dev/null
+++ b/cloud-init-0.7.2-fedora.patch
@@ -0,0 +1,33 @@
+diff -uNr cloud-init.orig/cloudinit/config/cc_keys_to_console.py cloud-init/cloudinit/config/cc_keys_to_console.py
+--- cloud-init.orig/cloudinit/config/cc_keys_to_console.py 2013-04-12 14:03:11.049761648 +0100
++++ cloud-init/cloudinit/config/cc_keys_to_console.py 2013-04-12 14:13:09.660280218 +0100
+@@ -26,7 +26,7 @@
+ frequency = PER_INSTANCE
+
+ # This is a tool that cloud init provides
+-HELPER_TOOL = '/usr/lib/cloud-init/write-ssh-key-fingerprints'
++HELPER_TOOL = '/usr/libexec/cloud-init/write-ssh-key-fingerprints'
+
+
+ def handle(name, cfg, _cloud, log, _args):
+diff -uNr cloud-init.orig/setup.py cloud-init/setup.py
+--- cloud-init.orig/setup.py 2013-04-12 14:03:11.052761671 +0100
++++ cloud-init/setup.py 2013-04-12 14:08:12.828042068 +0100
+@@ -45,7 +45,7 @@
+ INITSYS_ROOTS = {
+ 'sysvinit': '/etc/rc.d/init.d',
+ 'sysvinit_deb': '/etc/init.d',
+- 'systemd': '/etc/systemd/system/',
++ 'systemd': '/usr/lib/systemd/system/',
+ 'upstart': '/etc/init/',
+ }
+ INITSYS_TYPES = sorted(list(INITSYS_ROOTS.keys()))
+@@ -123,7 +123,7 @@
+ ('/etc/cloud/cloud.cfg.d', glob('config/cloud.cfg.d/*')),
+ ('/etc/cloud/templates', glob('templates/*')),
+ ('/usr/share/cloud-init', []),
+- ('/usr/lib/cloud-init',
++ ('/usr/libexec/cloud-init',
+ ['tools/uncloud-init',
+ 'tools/write-ssh-key-fingerprints']),
+ ('/usr/share/doc/cloud-init',
diff --git a/cloud-init-README.fedora b/cloud-init-README.fedora
index 99bf7ab..aa29630 100644
--- a/cloud-init-README.fedora
+++ b/cloud-init-README.fedora
@@ -1,12 +1,5 @@
The following cloud-init modules are currently unsupported on this OS:
- apt_update_upgrade ('apt_update', 'apt_upgrade', 'apt_mirror', 'apt_preserve_sources_list', 'apt_old_mirror', 'apt_sources', 'debconf_selections', 'packages' options)
- - byobu ('byobu_fy_default' option)
+ - byobu ('byobu_by_default' option)
- chef
- grub_dpkg
- - mcollective
- - set_hostname ('hostname' and 'fqdn' options)
- - update_hostname
-
-Future work:
- - 'hostname' and 'fqdn' support
- - 'packages' and yum support
diff --git a/cloud-init-fedora.cfg b/cloud-init-rhel.cfg
similarity index 63%
rename from cloud-init-fedora.cfg
rename to cloud-init-rhel.cfg
index b9dc2a9..40d3010 100644
--- a/cloud-init-fedora.cfg
+++ b/cloud-init-rhel.cfg
@@ -1,29 +1,36 @@
-user: ec2-user
+users:
+ - default
+
disable_root: 1
ssh_pwauth: 0
-cc_ready_cmd: ['/bin/true']
locale_configfile: /etc/sysconfig/i18n
mount_default_fields: [~, ~, 'auto', 'defaults,nofail', '0', '2']
+resize_rootfs_tmp: /dev
ssh_deletekeys: 0
ssh_genkeytypes: ~
-ssh_svcname: sshd
syslog_fix_perms: ~
cloud_init_modules:
- bootcmd
+ - write-files
- resizefs
- set_hostname
+ - update_hostname
+ - update_etc_hosts
- rsyslog
+ - users-groups
- ssh
cloud_config_modules:
- mounts
- - ssh-import-id
- locale
- set-passwords
- timezone
- puppet
+ - chef
+ - salt-minion
+ - mcollective
- disable-ec2-metadata
- runcmd
@@ -33,8 +40,18 @@ cloud_final_modules:
- scripts-per-boot
- scripts-per-instance
- scripts-user
+ - ssh-authkey-fingerprints
- keys-to-console
- phone-home
- final-message
+system_info:
+ distro: rhel
+ default_user:
+ name: cloud-user
+ paths:
+ cloud_dir: /var/lib/cloud
+ templates_dir: /etc/cloud/templates
+ ssh_svcname: sshd
+
# vim:syntax=yaml
diff --git a/cloud-init-sr1-bzr821.patch b/cloud-init-sr1-bzr821.patch
new file mode 100644
index 0000000..3d2a6e3
--- /dev/null
+++ b/cloud-init-sr1-bzr821.patch
@@ -0,0 +1,24 @@
+=== modified file 'cloud-init-0.7.2/cloudinit/sources/DataSourceConfigDrive.py'
+--- cloud-init-0.7.2/cloudinit/sources/DataSourceConfigDrive.py 2013-03-26 21:48:40 +0000
++++ cloud-init-0.7.2/cloudinit/sources/DataSourceConfigDrive.py 2013-06-05 00:42:55 +0000
+@@ -260,6 +260,7 @@
+
+ # Query optical drive to get it in blkid cache for 2.6 kernels
+ util.find_devs_with(path="/dev/sr0")
++ util.find_devs_with(path="/dev/sr1")
+
+ by_fstype = (util.find_devs_with("TYPE=vfat") +
+ util.find_devs_with("TYPE=iso9660"))
+
+=== modified file 'cloud-init-0.7.2/cloudinit/sources/DataSourceNoCloud.py'
+--- cloud-init-0.7.2/cloudinit/sources/DataSourceNoCloud.py 2013-03-26 21:48:40 +0000
++++ cloud-init-0.7.2/cloudinit/sources/DataSourceNoCloud.py 2013-06-05 00:42:55 +0000
+@@ -89,6 +89,7 @@
+ if label is not None:
+ # Query optical drive to get it in blkid cache for 2.6 kernels
+ util.find_devs_with(path="/dev/sr0")
++ util.find_devs_with(path="/dev/sr1")
+
+ fslist = util.find_devs_with("TYPE=vfat")
+ fslist.extend(util.find_devs_with("TYPE=iso9660"))
+
diff --git a/cloud-init.spec b/cloud-init.spec
index 63b0fa1..648cf97 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -4,40 +4,17 @@
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name: cloud-init
-Version: 0.6.3
-Release: 0.12.bzr532%{?dist}
+Version: 0.7.4
+Release: 1%{?dist}
Summary: Cloud instance init scripts
Group: System Environment/Base
License: GPLv3
URL: http://launchpad.net/cloud-init
-# bzr export -r 532 cloud-init-0.6.3-bzr532.tar.gz lp:cloud-init
-Source0: %{name}-%{version}-bzr532.tar.gz
-Source1: cloud-init-fedora.cfg
+Source0: https://launchpad.net/cloud-init/trunk/%{version}/+download/cloud-init-%{version}.tar.gz
+Source1: cloud-init-rhel.cfg
Source2: cloud-init-README.fedora
-
-Patch0: cloud-init-0.6.3-fedora.patch
-# Make runparts() work on Fedora
-# https://bugs.launchpad.net/cloud-init/+bug/934404
-Patch1: cloud-init-0.6.3-no-runparts.patch
-# https://bugs.launchpad.net/cloud-init/+bug/970071
-Patch2: cloud-init-0.6.3-lp970071.patch
-# Add sysv init scripts
-Patch3: cloud-init-0.6.3-sysv.patch
-# Support subprocess on python < 2.7
-Patch4: cloud-init-0.6.3-subprocess-2.6.patch
-# Add support for installing packages with yum
-Patch5: cloud-init-0.6.3-yum.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=850916
-# https://bugs.launchpad.net/cloud-init/+bug/1040200
-# http://bazaar.launchpad.net/~cloud-init-dev/cloud-init/trunk/revision/635
-Patch6: cloud-init-0.6.3-fqdn.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=857502
-# https://bugs.launchpad.net/cloud-init/+bug/1050962
-Patch7: cloud-init-0.6.3-ip-based-hostname.patch
-
-Patch100: cloud-init-0.6.3-use-python2.6.patch
-Patch101: cloud-init-0.6.3-ext4.patch
+Patch0: cloud-init-0.7.2-fedora.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,17 +28,22 @@ BuildRequires: python26-devel
BuildRequires: python-setuptools
Requires: e4fsprogs
%endif
+Requires: dmidecode
Requires: iproute
Requires: libselinux-python
Requires: net-tools
+Requires: policycoreutils-python
Requires: procps
+Requires: python-argparse
%if 0%{?rhel} >= 6
-Requires: python-boto
+Requires: python-boto >= 2.6.0
Requires: python-cheetah
Requires: python-configobj
+Requires: python-prettytable
Requires: PyYAML
+Requires: python-requests
%else
-Requires: python26-boto
+Requires: python26-boto >= 2.6.0
Requires: python26-cheetah
Requires: python26-configobj
Requires: python26-PyYAML
@@ -80,23 +62,11 @@ ssh keys and to let the user run various scripts.
%prep
-%setup -q -n %{name}-%{version}-bzr532
-%patch0 -p0
-%patch1 -p0
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p0
-%if 0%{?rhel} <= 5
-%patch100 -p0
-%patch101 -p1
-%endif
+%setup -q -n %{name}-%{version}
+%patch0 -p1
cp -p %{SOURCE2} README.fedora
-
%build
%{__python} setup.py build
@@ -105,21 +75,18 @@ cp -p %{SOURCE2} README.fedora
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-for x in $RPM_BUILD_ROOT/%{_bindir}/*.py; do mv "$x" "${x%.py}"; done
-chmod +x $RPM_BUILD_ROOT/%{python_sitelib}/cloudinit/SshUtil.py
mkdir -p $RPM_BUILD_ROOT/%{_sharedstatedir}/cloud
# We supply our own config file since our software differs from Ubuntu's.
cp -p %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/cloud/cloud.cfg
-# 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
# Install the init scripts
mkdir -p $RPM_BUILD_ROOT/%{_initrddir}
-install -p -m 755 sysv/* $RPM_BUILD_ROOT/%{_initrddir}/
+install -p -m 755 sysvinit/debian/* $RPM_BUILD_ROOT/%{_initrddir}/
+install -p -m 755 sysvinit/redhat/* $RPM_BUILD_ROOT/%{_initrddir}/
%clean
@@ -169,8 +136,28 @@ fi
%changelog
-* Wed Dec 13 2012 Andy Grimm <agrimm at gmail.com> - 0.6.3-0.12.bzr532
-- Correctly generate IP-based hostnames [RH:857502 LP:1050962]
+* Wed Jan 22 2013 Sam Kottler <shk at redhat.com> - 0.7.4-1
+- update to 0.7.4
+
+* Wed Jun 26 2013 Steven Hardy <shardy at redhat.com> 0.7.2-2
+- support optical drives with dev node /dev/sr1 (backport of LP rev 821))
+
+* Tue May 28 2013 Steven Hardy <shardy at redhat.com> 0.7.2-1
+- Update to 0.7.2
+- Added dependency on python-requests
+- Removed write-ssh-key-fingerprints patch (in upstream release)
+- Added boto >= 2.6.0 requirement
+
+* Fri Nov 16 2012 Alan Pevec <apevec at redhat.com> 0.7.1-2
+- define default user (Joe VLcek)
+- set distro to rhel in default config
+- adjust logger call for older util-linux
+
+* Wed Nov 14 2012 Alan Pevec <apevec at redhat.com> 0.7.1-1
+- Update to 0.7.1
+
+* Tue Oct 9 2012 Garrett Holmstrom <gholms at fedoraproject.org> - 0.7.0-1
+- Rebased against version 0.7.0
* Thu Sep 13 2012 Garrett Holmstrom <gholms at fedoraproject.org> - 0.6.3-0.11.bzr532
- Use a FQDN (instance-data.) for instance data URL fallback [RH:850916 LP:1040200]
diff --git a/sources b/sources
index d97d681..33c75e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c5f118f17683c7aacd8e127e756eb070 cloud-init-0.6.3-bzr532.tar.gz
+65053a7b2917ad1c26dc0a4d144b59c0 cloud-init-0.7.4.tar.gz
More information about the scm-commits
mailing list