Use package-installs in puppet-modules element

Migrates the puppet-modules element to use the package-installs element
instead of calling install-packages directly.

This helps us remove additional element dependencies in the undercloud
install by not having to rely on the yum element which provides
install-packages.

This change along with an instack-undercloud packaging change:
https://review.rdoproject.org/r/#/c/1206/ makes it such that the
undercloud install does not have to depend on the yum element, whether
it's using package or source for puppet-modules.

Change-Id: Ia8fb1b8d356d578adc58d0a53a573a39de024e9f
Closes-Bug: 1584864
This commit is contained in:
James Slagle 2016-05-23 15:35:36 -04:00
parent 3b52cd4b4b
commit 3ddcfc4e7e
3 changed files with 3 additions and 2 deletions

View File

@ -1,3 +1,4 @@
package-installs
pkg-map
puppet
source-repositories

View File

@ -2,6 +2,4 @@
set -eux
install-packages -m puppet-modules puppet_modules_package
ln -f -s /usr/share/openstack-puppet/modules/* /etc/puppet/modules/

View File

@ -0,0 +1,2 @@
puppet_modules_package:
installtype: package