openstack/tripleo-puppet-elements
Code Issues Proposed changes

Honor $DIB_DEFAULT_INSTALLTYPE in puppet-modules

Browse Source 
Makes the puppet-modules element honor the $DIB_DEFAULT_INSTALLTYPE
environment variable. This environment variable is set to source by
default.

Other elements, such as the enable-packages-install element may set it
to package.

Since the enable-packages-install element sets it to package at
01-export-install-types.bash[1], 01-puppet-modules-install-types.sh is
moved to 02-puppet-modules-install-types.sh so that it runs later.

Closes-Bug: 1583263
[1] https://github.com/openstack/tripleo-image-elements/blob/master/elements/enable-packages-install/environment.d/01-export-install-types.bash

Change-Id: I1d14fc9b113d45e7ab613f44011f442e4436a904
This commit is contained in:
James Slagle 2016-05-18 15:07:20 -04:00
parent e395cc63af
commit 3b52cd4b4b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
elements/puppet-modules/environment.d/01-puppet-modules-install-types.sh → elements/puppet-modules/environment.d/02-puppet-modules-install-types.sh
View File

@ -1,4 +1,5 @@
DIB_INSTALLTYPE_puppet_modules=${DIB_INSTALLTYPE_puppet_modules:-"source"} DIB_DEFAULT_INSTALLTYPE=${DIB_DEFAULT_INSTALLTYPE:-"source"}
DIB_INSTALLTYPE_puppet_modules=${DIB_INSTALLTYPE_puppet_modules:-"$DIB_DEFAULT_INSTALLTYPE"}
if [ "$DIB_INSTALLTYPE_puppet_modules" = "source" ]; then if [ "$DIB_INSTALLTYPE_puppet_modules" = "source" ]; then
for module_name in \ for module_name in \