diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e261af4..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*.rpm -*.tar.gz -results_cloud-init diff --git a/cloud-init-0.7.5-fedora.patch b/cloud-init-0.7.5-fedora.patch deleted file mode 100644 index 9938c77..0000000 --- a/cloud-init-0.7.5-fedora.patch +++ /dev/null @@ -1,33 +0,0 @@ -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-0.7.5-rsyslog-programname.patch b/cloud-init-0.7.5-rsyslog-programname.patch deleted file mode 100644 index ddc0206..0000000 --- a/cloud-init-0.7.5-rsyslog-programname.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: cloud-init-0.7.2/tools/21-cloudinit.conf -=================================================================== ---- cloud-init-0.7.2.orig/tools/21-cloudinit.conf -+++ cloud-init-0.7.2/tools/21-cloudinit.conf -@@ -1,5 +1,5 @@ - # Log cloudinit generated log messages to file --:syslogtag, isequal, "[CLOUDINIT]" /var/log/cloud-init.log -+:programname, isequal, "cloud-init" /var/log/cloud-init.log - - # comment out the following line to allow CLOUDINIT messages through. - # Doing so means you'll also get CLOUDINIT messages in /var/log/syslog diff --git a/cloud-init-0.7.5-udevadm-quiet.patch b/cloud-init-0.7.5-udevadm-quiet.patch deleted file mode 100644 index f67a296..0000000 --- a/cloud-init-0.7.5-udevadm-quiet.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: cloud-init-0.7.5/cloudinit/sources/DataSourceAltCloud.py -=================================================================== ---- cloud-init-0.7.5.orig/cloudinit/sources/DataSourceAltCloud.py -+++ cloud-init-0.7.5/cloudinit/sources/DataSourceAltCloud.py -@@ -42,7 +42,7 @@ CLOUD_INFO_FILE = '/etc/sysconfig/cloud- - # Shell command lists - CMD_DMI_SYSTEM = ['/usr/sbin/dmidecode', '--string', 'system-product-name'] - CMD_PROBE_FLOPPY = ['/sbin/modprobe', 'floppy'] --CMD_UDEVADM_SETTLE = ['/sbin/udevadm', 'settle', '--quiet', '--timeout=5'] -+CMD_UDEVADM_SETTLE = ['/sbin/udevadm', 'settle', '--timeout=5'] - - META_DATA_NOT_SUPPORTED = { - 'block-device-mapping': {}, diff --git a/cloud-init-README.fedora b/cloud-init-README.fedora deleted file mode 100644 index aa29630..0000000 --- a/cloud-init-README.fedora +++ /dev/null @@ -1,5 +0,0 @@ -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_by_default' option) - - chef - - grub_dpkg diff --git a/cloud-init-fedora.cfg b/cloud-init-fedora.cfg deleted file mode 100644 index 0dff3fe..0000000 --- a/cloud-init-fedora.cfg +++ /dev/null @@ -1,65 +0,0 @@ -users: - - default - -disable_root: 1 -ssh_pwauth: 0 - -mount_default_fields: [~, ~, 'auto', 'defaults,nofail', '0', '2'] -resize_rootfs_tmp: /dev -ssh_deletekeys: 0 -ssh_genkeytypes: ~ -syslog_fix_perms: ~ - -cloud_init_modules: - - migrator - - bootcmd - - write-files - - growpart - - resizefs - - set_hostname - - update_hostname - - update_etc_hosts - - rsyslog - - users-groups - - ssh - -cloud_config_modules: - - mounts - - locale - - set-passwords - - yum-add-repo - - package-update-upgrade-install - - timezone - - puppet - - chef - - salt-minion - - mcollective - - disable-ec2-metadata - - runcmd - -cloud_final_modules: - - rightscale_userdata - - scripts-per-once - - scripts-per-boot - - scripts-per-instance - - scripts-user - - ssh-authkey-fingerprints - - keys-to-console - - phone-home - - final-message - -system_info: - default_user: - name: fedora - lock_passwd: true - gecos: Fedora Cloud User - groups: [wheel, adm, systemd-journal] - sudo: ["ALL=(ALL) NOPASSWD:ALL"] - shell: /bin/bash - distro: fedora - paths: - cloud_dir: /var/lib/cloud - templates_dir: /etc/cloud/templates - ssh_svcname: sshd - -# vim:syntax=yaml diff --git a/cloud-init-settings-providers.patch b/cloud-init-settings-providers.patch deleted file mode 100644 index 937c274..0000000 --- a/cloud-init-settings-providers.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cloud-init-0.7.5/cloudinit/settings.py.orig 2014-06-12 19:45:29.132522989 -0500 -+++ cloud-init-0.7.5/cloudinit/settings.py 2014-06-12 19:45:40.670481588 -0500 -@@ -37,7 +37,7 @@ - 'OVF', - 'MAAS', - 'GCE', -- 'OpenStack' -+ 'OpenStack', - 'Ec2', - 'CloudSigma', - 'CloudStack', diff --git a/cloud-init-tmpfiles.conf b/cloud-init-tmpfiles.conf deleted file mode 100644 index 0c6d2a3..0000000 --- a/cloud-init-tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -d /run/cloud-init 0700 root root - - diff --git a/cloud-init.spec b/cloud-init.spec deleted file mode 100644 index 206aec6..0000000 --- a/cloud-init.spec +++ /dev/null @@ -1,304 +0,0 @@ -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%{!?license: %global license %%doc} - -# The only reason we are archful is because dmidecode is ExclusiveArch -# https://bugzilla.redhat.com/show_bug.cgi?id=1067089 -%global debug_package %{nil} - -Name: cloud-init -Version: 0.7.5 -Release: 6%{?dist} -Summary: Cloud instance init scripts - -Group: System Environment/Base -License: GPLv3 -URL: http://launchpad.net/cloud-init -Source0: https://launchpad.net/cloud-init/trunk/%{version}/+download/%{name}-%{version}.tar.gz -Source1: cloud-init-fedora.cfg -Source2: cloud-init-README.fedora -Source3: cloud-init-tmpfiles.conf - -# Deal with Fedora/Ubuntu path differences -Patch0: cloud-init-0.7.5-fedora.patch - -# Fix rsyslog log filtering -# https://code.launchpad.net/~gholms/cloud-init/rsyslog-programname/+merge/186906 -Patch1: cloud-init-0.7.5-rsyslog-programname.patch - -# Systemd 213 removed the --quiet option from ``udevadm settle'' -Patch2: cloud-init-0.7.5-udevadm-quiet.patch - -# there is a typo in setting.py -Patch3: cloud-init-settings-providers.patch - -# Deal with noarch -> arch -# https://bugzilla.redhat.com/show_bug.cgi?id=1067089 -Obsoletes: cloud-init < 0.7.5-3 - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: python-devel -BuildRequires: python-setuptools -BuildRequires: systemd-units -%ifarch %{?ix86} x86_64 ia64 -Requires: dmidecode -%endif -Requires: e2fsprogs -Requires: iproute -Requires: libselinux-python -Requires: net-tools -Requires: policycoreutils-python -Requires: procps -Requires: python-boto -Requires: python-cheetah -Requires: python-configobj -Requires: python-prettytable -Requires: python-requests -Requires: PyYAML -Requires: python-jsonpatch -Requires: rsyslog -Requires: shadow-utils -Requires: /usr/bin/run-parts -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units - -%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} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 - -cp -p %{SOURCE2} README.fedora - - -%build -%{__python} setup.py build - - -%install -rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT - -# Don't ship the tests -rm -r $RPM_BUILD_ROOT%{python_sitelib}/tests - -mkdir -p $RPM_BUILD_ROOT/var/lib/cloud - -# /run/cloud-init needs a tmpfiles.d entry -mkdir -p $RPM_BUILD_ROOT/run/cloud-init -mkdir -p $RPM_BUILD_ROOT/%{_tmpfilesdir} -cp -p %{SOURCE3} $RPM_BUILD_ROOT/%{_tmpfilesdir}/%{name}.conf - -# We supply our own config file since our software differs from Ubuntu's. -cp -p %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/cloud/cloud.cfg - -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 systemd bits -mkdir -p $RPM_BUILD_ROOT/%{_unitdir} -cp -p systemd/* $RPM_BUILD_ROOT/%{_unitdir} - - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%post -if [ $1 -eq 1 ] ; then - # Initial installation - # Enabled by default per "runs once then goes away" exception - /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 - -%preun -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /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 || : - # One-shot services -> no need to stop -fi - -%postun -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -# One-shot services -> no need to restart - - -%files -%license LICENSE -%doc ChangeLog TODO README.fedora -%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg -%dir %{_sysconfdir}/cloud/cloud.cfg.d -%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/*.cfg -%doc %{_sysconfdir}/cloud/cloud.cfg.d/README -%dir %{_sysconfdir}/cloud/templates -%config(noreplace) %{_sysconfdir}/cloud/templates/* -%{_unitdir}/cloud-config.service -%{_unitdir}/cloud-config.target -%{_unitdir}/cloud-final.service -%{_unitdir}/cloud-init-local.service -%{_unitdir}/cloud-init.service -%{_tmpfilesdir}/%{name}.conf -%{python_sitelib}/* -%{_libexecdir}/%{name} -%{_bindir}/cloud-init* -%doc %{_datadir}/doc/%{name} -%dir /run/cloud-init -%dir /var/lib/cloud - -%config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf - - -%changelog -* Thu Jun 12 2014 Dennis Gilmore - 0.7.5-6 -- fix typo in settings.py preventing metadata being fecthed in ec2 - -* Mon Jun 9 2014 Garrett Holmstrom - 0.7.5-5 -- Stopped calling ``udevadm settle'' with --quiet since systemd 213 removed it - -* Sat Jun 07 2014 Fedora Release Engineering - 0.7.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon Jun 2 2014 Garrett Holmstrom - 0.7.5-3 -- Make dmidecode dependency arch-dependent [RH:1025071 RH:1067089] - -* Mon Jun 2 2014 Garrett Holmstrom - 0.7.2-9 -- Write /etc/locale.conf instead of /etc/sysconfig/i18n [RH:1008250] -- Add tmpfiles.d configuration for /run/cloud-init [RH:1103761] -- Use the license rpm macro -- BuildRequire python-setuptools, not python-setuptools-devel - -* Fri May 30 2014 Matthew Miller - 0.7.5-2 -- add missing python-jsonpatch dependency [RH:1103281] - -* Tue Apr 29 2014 Sam Kottler - 0.7.5-1 -- Update to 0.7.5 and remove patches which landed in the release - -* Sat Jan 25 2014 Sam Kottler - 0.7.2-8 -- Remove patch to the Puppet service unit nane [RH:1057860] - -* Tue Sep 24 2013 Garrett Holmstrom - 0.7.2-7 -- Dropped xfsprogs dependency [RH:974329] - -* Tue Sep 24 2013 Garrett Holmstrom - 0.7.2-6 -- Added yum-add-repo module - -* Fri Sep 20 2013 Garrett Holmstrom - 0.7.2-5 -- Fixed puppet agent service name [RH:1008250] -- Let systemd handle console output [RH:977952 LP:1228434] -- Fixed restorecon failure when selinux is disabled [RH:967002 LP:1228441] -- Fixed rsyslog log filtering -- Added missing modules [RH:966888] - -* Sat Aug 03 2013 Fedora Release Engineering - 0.7.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sat Jun 15 2013 Matthew Miller - 0.7.2-3 -- switch ec2-user to "fedora" -- see bugzilla #971439. To use another - name, use #cloud-config option "users:" in userdata in cloud metadata - service -- add that user to systemd-journal group - -* Fri May 17 2013 Steven Hardy - 0.7.2 -- Update to the 0.7.2 release - -* Thu May 02 2013 Steven Hardy - 0.7.2-0.1.bzr809 -- Rebased against upstream rev 809, fixes several F18 related issues -- Added dependency on python-requests - -* Sat Apr 6 2013 Orion Poplawski - 0.7.1-4 -- Don't ship tests - -* Wed Feb 13 2013 Fedora Release Engineering - 0.7.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Dec 13 2012 Garrett Holmstrom - 0.7.1-2 -- Added default_user to cloud.cfg (this is required for ssh keys to work) - -* Wed Nov 21 2012 Garrett Holmstrom - 0.7.1-1 -- Rebased against version 0.7.1 -- Fixed broken sudoers file generation -- Fixed "resize_root: noblock" [LP:1080985] - -* Tue Oct 9 2012 Garrett Holmstrom - 0.7.0-1 -- Rebased against version 0.7.0 -- Fixed / filesystem resizing - -* Sat Sep 22 2012 Garrett Holmstrom - 0.7.0-0.3.bzr659 -- Added dmidecode dependency for DataSourceAltCloud - -* Sat Sep 22 2012 Garrett Holmstrom - 0.7.0-0.2.bzr659 -- Rebased against upstream rev 659 -- Fixed hostname persistence -- Fixed ssh key printing -- Fixed sudoers file permissions - -* Mon Sep 17 2012 Garrett Holmstrom - 0.7.0-0.1.bzr650 -- Rebased against upstream rev 650 -- Added support for useradd --selinux-user - -* Thu Sep 13 2012 Garrett Holmstrom - 0.6.3-0.5.bzr532 -- Use a FQDN (instance-data.) for instance data URL fallback [RH:850916 LP:1040200] -- Shut off systemd timeouts [RH:836269] -- Send output to the console [RH:854654] - -* Wed Jul 18 2012 Fedora Release Engineering - 0.6.3-0.4.bzr532 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Wed Jun 27 2012 Pádraig Brady - 0.6.3-0.3.bzr532 -- Add support for installing yum packages - -* Sat Mar 31 2012 Andy Grimm - 0.6.3-0.2.bzr532 -- Fixed incorrect interpretation of relative path for - AuthorizedKeysFile (BZ #735521) - -* Mon Mar 5 2012 Garrett Holmstrom - 0.6.3-0.1.bzr532 -- Rebased against upstream rev 532 -- Fixed runparts() incompatibility with Fedora - -* Thu Jan 12 2012 Fedora Release Engineering - 0.6.2-0.8.bzr457 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Oct 5 2011 Garrett Holmstrom - 0.6.2-0.7.bzr457 -- Disabled SSH key-deleting on startup - -* Wed Sep 28 2011 Garrett Holmstrom - 0.6.2-0.6.bzr457 -- Consolidated selinux file context patches -- Fixed cloud-init.service dependencies -- Updated sshkeytypes patch -- Dealt with differences from Ubuntu's sshd - -* Sat Sep 24 2011 Garrett Holmstrom - 0.6.2-0.5.bzr457 -- Rebased against upstream rev 457 -- Added missing dependencies - -* Fri Sep 23 2011 Garrett Holmstrom - 0.6.2-0.4.bzr450 -- Added more macros to the spec file - -* Fri Sep 23 2011 Garrett Holmstrom - 0.6.2-0.3.bzr450 -- Fixed logfile permission checking -- Fixed SSH key generation -- Fixed a bad method call in FQDN-guessing [LP:857891] -- Updated localefile patch -- Disabled the grub_dpkg module -- Fixed failures due to empty script dirs [LP:857926] - -* Fri Sep 23 2011 Garrett Holmstrom - 0.6.2-0.2.bzr450 -- Updated tzsysconfig patch - -* Wed Sep 21 2011 Garrett Holmstrom - 0.6.2-0.1.bzr450 -- Initial packaging diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..1e5c7f4 --- /dev/null +++ b/dead.package @@ -0,0 +1,2 @@ +2017-08-11: package is now included in RHEL + diff --git a/sources b/sources deleted file mode 100644 index b4aba62..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -de5250a2e7308946c095f2de5eb421bd cloud-init-0.7.5.tar.gz