[cloud-init/f20: 3/8] Fix puppet agent service name
gholms
gholms at fedoraproject.org
Wed Sep 25 01:44:53 UTC 2013
commit f048ee2476f50f8f9c134d098764bf49ecf0e816
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date: Fri Sep 20 16:18:54 2013 -0700
Fix puppet agent service name
https://bugzilla.redhat.com/show_bug.cgi?id=1008250
cloud-init-0.7.2-puppetagent.patch | 19 +++++++++++++++++++
cloud-init.spec | 14 +++++++++++++-
2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/cloud-init-0.7.2-puppetagent.patch b/cloud-init-0.7.2-puppetagent.patch
new file mode 100644
index 0000000..ddb9b18
--- /dev/null
+++ b/cloud-init-0.7.2-puppetagent.patch
@@ -0,0 +1,19 @@
+Index: cloud-init-0.7.2/cloudinit/config/cc_puppet.py
+===================================================================
+--- cloud-init-0.7.2.orig/cloudinit/config/cc_puppet.py
++++ cloud-init-0.7.2/cloudinit/config/cc_puppet.py
+@@ -39,7 +39,7 @@ def _autostart_puppet(log):
+ '-e', 's/^START=.*/START=yes/',
+ '/etc/default/puppet'], capture=False)
+ elif os.path.exists('/bin/systemctl'):
+- util.subp(['/bin/systemctl', 'enable', 'puppet.service'],
++ util.subp(['/bin/systemctl', 'enable', 'puppetagent.service'],
+ capture=False)
+ elif os.path.exists('/sbin/chkconfig'):
+ util.subp(['/sbin/chkconfig', 'puppet', 'on'], capture=False)
+@@ -115,4 +115,4 @@ def handle(name, cfg, cloud, log, _args)
+ _autostart_puppet(log)
+
+ # Start puppetd
+- util.subp(['service', 'puppet', 'start'], capture=False)
++ util.subp(['service', 'puppetagent', 'start'], capture=False)
diff --git a/cloud-init.spec b/cloud-init.spec
index 79a915f..97ceb32 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -2,7 +2,7 @@
Name: cloud-init
Version: 0.7.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Cloud instance init scripts
Group: System Environment/Base
@@ -11,8 +11,16 @@ 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
+
+# Deal with Fedora/Ubuntu path differences
Patch0: cloud-init-0.7.2-fedora.patch
+# "puppet" service was renamed to "puppetagent" in F19 as it was ported to
+# systemd
+# https://bugzilla.redhat.com/show_bug.cgi?id=1008250
+Patch1: cloud-init-0.7.2-puppetagent.patch
+
+
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,6 +57,7 @@ ssh keys and to let the user run various scripts.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1
+%patch1 -p1
cp -p %{SOURCE2} README.fedora
@@ -129,6 +138,9 @@ fi
%changelog
+* Fri Sep 20 2013 Garrett Holmstrom <gholms at fedoraproject.org> - 0.7.2-5
+- Fixed puppet agent service name [RH:1008250]
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list