cloud-init-dev team mailing list archive

[Vlastimil Holer <vlastimil.holer@xxxxxxxxx>]

Vlastimil Holer has proposed merging lp:~vlastimil-holer/cloud-init/fix-rpm-build into lp:cloud-init.

Requested reviews:
  cloud init development team (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~vlastimil-holer/cloud-init/fix-rpm-build/+merge/204266

Following patch for RPM fixes:
- failing build due to missing Requires (changed to requirements.txt)
- RH: require sudo >= 1.7.2p2-3 (with sudoers.d/)
- RH: apply sudo configuration so that allocated ttys aren't required
-- 
https://code.launchpad.net/~vlastimil-holer/cloud-init/fix-rpm-build/+merge/204266
Your team cloud init development team is requested to review the proposed merge of lp:~vlastimil-holer/cloud-init/fix-rpm-build into lp:cloud-init.

=== modified file 'packages/redhat/cloud-init.spec.in'
--- packages/redhat/cloud-init.spec.in	2014-01-15 11:49:52 +0000
+++ packages/redhat/cloud-init.spec.in	2014-01-31 15:32:11 +0000
@@ -34,7 +34,7 @@
 Requires:       net-tools
 Requires:       procps
 Requires:       shadow-utils
-Requires:       sudo
+Requires:       sudo >= 1.7.2p2-3
 
 # Install pypi 'dynamic' requirements
 #for $r in $requires
@@ -91,6 +91,8 @@
 mkdir -p \$RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d
 cp -p tools/21-cloudinit.conf \
       \$RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d/21-cloudinit.conf
+install -Dpm 440 tools/sudo \
+      \$RPM_BUILD_ROOT/%{_sysconfdir}/sudoers.d/cloud-init
 
 %clean
 rm -rf \$RPM_BUILD_ROOT
@@ -169,7 +171,7 @@
 /usr/lib/%{name}/write-ssh-key-fingerprints
 
 # Docs
-%doc TODO LICENSE ChangeLog Requires
+%doc TODO LICENSE ChangeLog requirements.txt
 %doc %{_defaultdocdir}/cloud-init/*
 
 # Configs
@@ -180,6 +182,7 @@
 %dir                    %{_sysconfdir}/cloud/templates
 %config(noreplace)      %{_sysconfdir}/cloud/templates/*
 %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
+%config(noreplace) %{_sysconfdir}/sudoers.d/cloud-init
 
 # Python code is here...
 %{python_sitelib}/*

=== modified file 'packages/suse/cloud-init.spec.in'
--- packages/suse/cloud-init.spec.in	2014-01-15 11:49:52 +0000
+++ packages/suse/cloud-init.spec.in	2014-01-31 15:32:11 +0000
@@ -107,7 +107,7 @@
 # Move documentation
 mkdir -p %{buildroot}/%{_defaultdocdir}
 mv %{buildroot}/usr/share/doc/cloud-init %{buildroot}/%{_defaultdocdir}
-for doc in TODO LICENSE ChangeLog Requires ; do
+for doc in TODO LICENSE ChangeLog requirements.txt; do
    cp \${doc} %{buildroot}/%{_defaultdocdir}/cloud-init
 done
 

=== added file 'tools/sudo'
--- tools/sudo	1970-01-01 00:00:00 +0000
+++ tools/sudo	2014-01-31 15:32:11 +0000
@@ -0,0 +1,3 @@
+Cmnd_Alias CI = /bin/bash
+root ALL=(nobody) NOPASSWD: CI
+Defaults!CI !requiretty