x/cloud-init
Code Issues Proposed changes

Make enabling puppet service work on Fedora

Browse Source 
configure puppet service to start on fedora based on one of:
 * presence of /etc/default/puppet (Ubuntu)
 * /bin/systemctl
 * /sbin/chkconfig

taken from
git://pkgs.fedoraproject.org/cloud-init.git
commit 87f33190f43d2b26cced4597e7298835024466c2
Author: Garrett Holmstrom <gholms@fedoraproject.org>
Patch7: cloud-init-0.6.2-puppetenable.patch
This commit is contained in:
Scott Moser 2011-10-30 17:41:01 -04:00
parent 724e4f4ae0
commit 699127c013
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cloudinit/CloudConfig/cc_puppet.py
View File

@ -16,6 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import os
import os.path
import pwd
import socket
import subprocess
@ -84,10 +85,15 @@ def handle(name,cfg,cloud,log,args):
with open('/etc/puppet/puppet.conf', 'wb') as configfile:
puppet_config.write(configfile)
util.restorecon_if_possible('/etc/puppet/puppet.conf')
# Set puppet default file to automatically start
subprocess.check_call(['sed', '-i',
'-e', 's/^START=.*/START=yes/',
'/etc/default/puppet'])
# Set puppet to automatically start
if os.path.exists('/etc/default/puppet'):
subprocess.check_call(['sed', '-i',
'-e', 's/^START=.*/START=yes/',
'/etc/default/puppet'])
elif os.path.exists('/bin/systemctl'):
subprocess.check_call(['/bin/systemctl', 'enable', 'puppet.service'])
elif os.path.exists('/sbin/chkconfig'):
subprocess.check_call(['/sbin/chkconfig', 'puppet', 'on'])
# Start puppetd
subprocess.check_call(['service', 'puppet', 'start'])