aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile
diff options
context:
space:
mode:
authorAlex Schultz <aschultz@redhat.com>2017-03-23 09:58:34 -0600
committerEmilien Macchi <emilien@redhat.com>2017-03-26 03:27:48 +0000
commit413a6947bfe491b21af2a6ca9ea41c27d9459c69 (patch)
tree754bc32499e0dbcf6ffafb0dcf6d2c29902d9bf9 /manifests/profile
parent00e4ad0bf0e5ac531e91912c4104dbaa0d8fe921 (diff)
Ensure iscsi-initiator-utils installed
We attempt to use iscsi-iname in an exec for our nova compute profile but we do not ensure that the package providing this command is installed. This change adds the package definition for iscsi-initiator-utils to ensure it is installed before trying to use iscsi-iname. Change-Id: I1bfdb68170931fd05a09859cf8eefb50ed20915d Closes-Bug: #1675462 (cherry picked from commit 2102a610c14d357f99a531250e676d6366559212)
Diffstat (limited to 'manifests/profile')
-rw-r--r--manifests/profile/base/nova/compute.pp2
1 files changed, 2 insertions, 0 deletions
diff --git a/manifests/profile/base/nova/compute.pp b/manifests/profile/base/nova/compute.pp
index 0eb2ed7..84b8bd5 100644
--- a/manifests/profile/base/nova/compute.pp
+++ b/manifests/profile/base/nova/compute.pp
@@ -48,10 +48,12 @@ class tripleo::profile::base::nova::compute (
# When utilising images for deployment, we need to reset the iSCSI initiator name to make it unique
# https://bugzilla.redhat.com/show_bug.cgi?id=1244328
+ ensure_resource('package', 'iscsi-initiator-utils', { ensure => 'present' })
exec { 'reset-iscsi-initiator-name':
command => '/bin/echo InitiatorName=$(/usr/sbin/iscsi-iname) > /etc/iscsi/initiatorname.iscsi',
onlyif => '/usr/bin/test ! -f /etc/iscsi/.initiator_reset',
before => File['/etc/iscsi/.initiator_reset'],
+ require => Package['iscsi-initiator-utils'],
}
file { '/etc/iscsi/.initiator_reset':
ensure => present,