opendev/system-config
Code Issues Proposed changes

Merge "centos: use Centos openstack repos, not RDO"

Browse Source
This commit is contained in:
Jenkins 2017-04-21 15:34:43 +00:00 committed by Gerrit Code Review
commit c8a70527e2
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
install_puppet.sh
View File

@ -151,9 +151,13 @@ function setup_puppet_rhel7 {
# Wipe out templatedir so we don't get warnings about it # Wipe out templatedir so we don't get warnings about it
sed -i '/templatedir/d' /etc/puppet/puppet.conf sed -i '/templatedir/d' /etc/puppet/puppet.conf
# install RDO repo as well; this covers a few things like # install CentOS OpenStack repos as well (rebuilds of RDO
# openvswitch that aren't available # packages). We don't use openstack project rpm files, but covers
yum install -y https://rdoproject.org/repos/rdo-release.rpm # a few things like qemu-kvm-ev (the forward port of qemu with
# later features) that aren't available in base. We need this
# early for things like openvswitch (XXX: should be installed via
# dib before this?)
yum install -y centos-release-openstack-ocata
} }
function setup_puppet_ubuntu { function setup_puppet_ubuntu {