x/packstack
Code Issues Proposed changes

Don't copy the create_resources module if on Fedora

Browse Source
This commit is contained in:
Derek Higgins
2012-11-27 10:12:17 -05:00
parent b0b92911a5
commit 4ded3b07d3
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packstack/plugins/puppet_950.py
View File

@@ -3,6 +3,7 @@ Installs and configures puppet
""" """
import logging import logging
import os import os
import platform
import uuid import uuid
import packstack.installer.engine_validators as validate import packstack.installer.engine_validators as validate
@@ -72,9 +73,12 @@ def installpuppet():
def copyPuppetModules(): def copyPuppetModules():
server = utils.ScriptRunner() server = utils.ScriptRunner()
tar_opts = ""
if platform.linux_distribution()[0] == "Fedora":
tar_opts += "--exclude create_resources "
for hostname in gethostlist(controller.CONF): for hostname in gethostlist(controller.CONF):
server.append("cd %s"%basedefs.DIR_PROJECT_DIR,) server.append("cd %s"%basedefs.DIR_PROJECT_DIR,)
server.append("tar --dereference -czf - puppet/manifests puppet/modules | ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null root@%s tar -C /etc -xzf -"%(hostname)) server.append("tar %s --dereference -czf - puppet/manifests puppet/modules | ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null root@%s tar -C /etc -xzf -"%(tar_opts, hostname))
server.execute() server.execute()
def applyPuppetManifest(): def applyPuppetManifest():