openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Do not rely on openstack-puppet-modules"

Browse Source
This commit is contained in:
Zuul 2017-10-24 03:55:37 +00:00 committed by Gerrit Code Review
commit aabc588a68
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployed-server/deployed-server-bootstrap-centos.sh
View File

@ -5,7 +5,7 @@ set -eux
yum install -y \ yum install -y \
jq \ jq \
python-ipaddr \ python-ipaddr \
openstack-puppet-modules \ puppet-tripleo \
os-net-config \ os-net-config \
openvswitch \ openvswitch \
python-heat-agent* \ python-heat-agent* \

2
deployed-server/deployed-server-bootstrap-rhel.sh
View File

@ -5,7 +5,7 @@ set -eux
yum install -y \ yum install -y \
jq \ jq \
python-ipaddr \ python-ipaddr \
openstack-puppet-modules \ puppet-tripleo\
os-net-config \ os-net-config \
openvswitch \ openvswitch \
python-heat-agent* \ python-heat-agent* \

6
extraconfig/tasks/yum_update.sh
View File

@ -98,10 +98,10 @@ if [[ "$pacemaker_status" == "active" ]] ; then
pcs cluster stop pcs cluster stop
fi fi
else else
echo "Upgrading openstack-puppet-modules and its dependencies" echo "Upgrading Puppet modules and dependencies"
check_for_yum_lock check_for_yum_lock
yum -q -y update openstack-puppet-modules yum -q -y update puppet-tripleo
yum deplist openstack-puppet-modules | awk '/dependency/{print $2}' | xargs yum -q -y update yum deplist puppet-tripleo | awk '/dependency/{print $2}' | xargs yum -q -y update
echo "Upgrading other packages is handled by config management tooling" echo "Upgrading other packages is handled by config management tooling"
echo -n "true" > $heat_outputs_path.update_managed_packages echo -n "true" > $heat_outputs_path.update_managed_packages
exit 0 exit 0