x/solar
Code Issues Proposed changes

Merge branch 'master' into various-fixes

Browse Source
This commit is contained in:
Przemyslaw Kaminski 2015-07-17 15:35:47 +02:00
commit 685c3a11e6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
solar/solar/core/handlers/puppet.py
View File

@ -7,7 +7,7 @@ from fabric.contrib import project as fabric_project
import os import os
from solar.core.log import log from solar.core.log import log
from solar.core.handlers.base import BaseHandler from solar.core.handlers.base import TempFileHandler
from solar.core.provider import GitProvider from solar.core.provider import GitProvider
@ -150,7 +150,7 @@ class LibrarianPuppet(ResourceSSHMixin):
# - hiera-redis is installed with the 2.0 fix (https://github.com/GGenie/hiera-redis) # - hiera-redis is installed with the 2.0 fix (https://github.com/GGenie/hiera-redis)
# - redis is installed and cluster set up with master (on slaves set up 'slaveof 10.0.0.2 6379') # - redis is installed and cluster set up with master (on slaves set up 'slaveof 10.0.0.2 6379')
# - redis keys are separated by colon (same as in hiera-redis backend) # - redis keys are separated by colon (same as in hiera-redis backend)
class Puppet(ResourceSSHMixin, BaseHandler): class Puppet(ResourceSSHMixin, TempFileHandler):
def action(self, resource, action_name): def action(self, resource, action_name):
log.debug('Executing Puppet manifest %s %s', action_name, resource) log.debug('Executing Puppet manifest %s %s', action_name, resource)