diff --git a/deployed-server/deployed-server-bootstrap-centos.sh b/deployed-server/deployed-server-bootstrap-centos.sh index 6f2bb124b1..90cdf6d6fe 100644 --- a/deployed-server/deployed-server-bootstrap-centos.sh +++ b/deployed-server/deployed-server-bootstrap-centos.sh @@ -5,7 +5,7 @@ set -eux yum install -y \ jq \ python-ipaddr \ - openstack-puppet-modules \ + puppet-tripleo \ os-net-config \ openvswitch \ python-heat-agent* \ diff --git a/deployed-server/deployed-server-bootstrap-rhel.sh b/deployed-server/deployed-server-bootstrap-rhel.sh index 9e9e9b3b1d..de6f2d862f 100644 --- a/deployed-server/deployed-server-bootstrap-rhel.sh +++ b/deployed-server/deployed-server-bootstrap-rhel.sh @@ -5,7 +5,7 @@ set -eux yum install -y \ jq \ python-ipaddr \ - openstack-puppet-modules \ + puppet-tripleo\ os-net-config \ openvswitch \ python-heat-agent* \ diff --git a/extraconfig/tasks/yum_update.sh b/extraconfig/tasks/yum_update.sh index c0c92a601a..6d5590eedf 100755 --- a/extraconfig/tasks/yum_update.sh +++ b/extraconfig/tasks/yum_update.sh @@ -98,10 +98,10 @@ if [[ "$pacemaker_status" == "active" ]] ; then pcs cluster stop fi else - echo "Upgrading openstack-puppet-modules and its dependencies" + echo "Upgrading Puppet modules and dependencies" check_for_yum_lock - yum -q -y update openstack-puppet-modules - yum deplist openstack-puppet-modules | awk '/dependency/{print $2}' | xargs yum -q -y update + yum -q -y update puppet-tripleo + yum deplist puppet-tripleo | awk '/dependency/{print $2}' | xargs yum -q -y update echo "Upgrading other packages is handled by config management tooling" echo -n "true" > $heat_outputs_path.update_managed_packages exit 0