Merge "Update Centos/RHEL to use Kilo RDO packages"

This commit is contained in:
Jenkins 2015-07-09 14:05:11 +00:00 committed by Gerrit Code Review
commit 69ba244ca8

View File

@ -282,8 +282,8 @@ EOF
# ... and also optional to be enabled # ... and also optional to be enabled
sudo yum-config-manager --enable rhel-7-server-optional-rpms sudo yum-config-manager --enable rhel-7-server-optional-rpms
RHEL_RDO_REPO_RPM=${RHEL7_RDO_REPO_RPM:-"https://repos.fedorapeople.org/repos/openstack/openstack-juno/rdo-release-juno-1.noarch.rpm"} RHEL_RDO_REPO_RPM=${RHEL7_RDO_REPO_RPM:-"https://repos.fedorapeople.org/repos/openstack/openstack-kilo/rdo-release-kilo-1.noarch.rpm"}
RHEL_RDO_REPO_ID=${RHEL7_RDO_REPO_ID:-"openstack-juno"} RHEL_RDO_REPO_ID=${RHEL7_RDO_REPO_ID:-"openstack-kilo"}
if ! sudo yum repolist enabled $RHEL_RDO_REPO_ID | grep -q $RHEL_RDO_REPO_ID; then if ! sudo yum repolist enabled $RHEL_RDO_REPO_ID | grep -q $RHEL_RDO_REPO_ID; then
echo "RDO repo not detected; installing" echo "RDO repo not detected; installing"