x/packstack
Code Issues Proposed changes

Merge "Always enable EPEL repo when installing RDO"

Browse Source
This commit is contained in:
Jenkins
2014-10-28 09:58:35 +00:00
committed by Gerrit Code Review
parent d5f1e34491 bb0ba39e25
commit 733aa73c08
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/packstack.rst
View File

@@ -355,7 +355,7 @@ Server Prepare Configs
---------------------- ----------------------
**CONFIG_USE_EPEL** **CONFIG_USE_EPEL**
Install OpenStack from EPEL. If set to "y" EPEL will be installed on each server ['y', 'n']. Install OpenStack from EPEL. If set to "y" EPEL will be installed on each server ['y', 'n']. When installing RDO, this option will be overriden, as EPEL is a requirement for RDO.
**CONFIG_REPO** **CONFIG_REPO**
A comma separated list of URLs to any additional yum repositories to install. A comma separated list of URLs to any additional yum repositories to install.

8
packstack/plugins/serverprep_001.py
View File

@@ -565,6 +565,10 @@ def manage_rdo(host, config):
except exceptions.ExecuteRuntimeError: except exceptions.ExecuteRuntimeError:
# RDO repo is not installed, so we don't need to continue # RDO repo is not installed, so we don't need to continue
return return
# We are installing RDO. EPEL is a requirement, so enable it, overriding
# any configured option
config['CONFIG_USE_EPEL'] = 'y'
match = re.match(r'^(?P<version>\w+)\-(?P<release>\d+\.[\d\w]+)\n', out) match = re.match(r'^(?P<version>\w+)\-(?P<release>\d+\.[\d\w]+)\n', out)
version, release = match.group('version'), match.group('release') version, release = match.group('version'), match.group('release')
rdo_url = ("http://rdo.fedorapeople.org/openstack/openstack-%(version)s/" rdo_url = ("http://rdo.fedorapeople.org/openstack/openstack-%(version)s/"
@@ -653,10 +657,10 @@ def server_prep(config, messages):
'echo "no rhos-log-collector available"' % sos_rpms) 'echo "no rhos-log-collector available"' % sos_rpms)
server.execute() server.execute()
# enable or disable EPEL according to configuration
manage_epel(hostname, config)
# enable RDO if it is installed locally # enable RDO if it is installed locally
manage_rdo(hostname, config) manage_rdo(hostname, config)
# enable or disable EPEL according to configuration
manage_epel(hostname, config)
reponame = 'rhel-server-ost-6-4-rpms' reponame = 'rhel-server-ost-6-4-rpms'
server.clear() server.clear()