Merge "Install puppet after the rpm is set on centos 7"

This commit is contained in:
Jenkins 2017-03-01 06:12:04 +00:00 committed by Gerrit Code Review
commit 263525eedc

View File

@ -145,9 +145,10 @@ EOF
yum update -y
# NOTE: we preinstall lsb_release to ensure facter sets lsbdistcodename
yum install -y redhat-lsb-core git puppet
yum install -y redhat-lsb-core git
rpm -ivh $puppet_pkg
yum install -y puppet
# see comments in setup_puppet_fedora
ln -s /usr/bin/pip /usr/bin/pip-python