x/packstack
Code Issues Proposed changes

Now only install EPEL if configured todo so

Browse Source 
This was a hack to get puppet from EPEL
This commit is contained in:
Derek Higgins
2012-12-06 19:06:57 -05:00
parent 3f6d9c012b
commit 1dee9a3ced
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packstack/plugins/puppet_950.py
View File

@@ -62,9 +62,6 @@ def installpuppet():
for hostname in gethostlist(controller.CONF): for hostname in gethostlist(controller.CONF):
server = utils.ScriptRunner(hostname) server = utils.ScriptRunner(hostname)
server.append("rpm -q puppet || yum install -y puppet") server.append("rpm -q puppet || yum install -y puppet")
# disable epel if on rhel
if controller.CONF["CONFIG_USE_EPEL"] == 'n':
server.append("grep 'Red Hat Enterprise Linux' /etc/redhat-release && sed -i -e 's/enabled=1/enabled=0/g' /etc/yum.repos.d/epel.repo || echo -n ''")
server.execute() server.execute()
def copyPuppetModules(): def copyPuppetModules():

5
packstack/plugins/serverprep_901.py
View File

@@ -65,8 +65,9 @@ def serverprep():
hostname = hostname.split('/')[0] hostname = hostname.split('/')[0]
server = utils.ScriptRunner(hostname) server = utils.ScriptRunner(hostname)
# install epel if on rhel # install epel if on rhel and epel is configured
server.append("grep 'Red Hat Enterprise Linux' /etc/redhat-release && ( rpm -q epel-release-6-7 || rpm -Uvh http://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-7.noarch.rpm ) || echo -n ''") if controller.CONF["CONFIG_USE_EPEL"] == 'y':
server.append("grep 'Red Hat Enterprise Linux' /etc/redhat-release && ( rpm -q epel-release || rpm -Uvh http://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-7.noarch.rpm ) || echo -n ''")
server.append("mkdir -p %s"%basedefs.PUPPET_MANIFEST_DIR) server.append("mkdir -p %s"%basedefs.PUPPET_MANIFEST_DIR)
server.execute() server.execute()