From 3df1f544af97aa0aeda9f80145d16ceb1a9c0239 Mon Sep 17 00:00:00 2001 From: Igor Gajsin Date: Wed, 16 Dec 2015 14:12:36 +0300 Subject: [PATCH] set the path parameter into exec apply-nova-patch resource There is the aply-nova-patch resource which patch some files. Due to unknow reason it works on controller and does not work on compute-vmware when the path parameter is not specified. This commit add path in both cases. Change-Id: Ie34c068a203dc78d1eacd799102a9107c4048d68 Closes-bug: #1526691 --- deployment_scripts/puppet/manifests/compute-vmware.pp | 1 + deployment_scripts/puppet/modules/vmware_dvs/manifests/init.pp | 1 + 2 files changed, 2 insertions(+) diff --git a/deployment_scripts/puppet/manifests/compute-vmware.pp b/deployment_scripts/puppet/manifests/compute-vmware.pp index 2ad013d..c1dddb3 100644 --- a/deployment_scripts/puppet/manifests/compute-vmware.pp +++ b/deployment_scripts/puppet/manifests/compute-vmware.pp @@ -33,6 +33,7 @@ file {'/usr/lib/python2.7/dist-packages/nova.patch': notify => Exec['apply-nova-patch'], } exec {'apply-nova-patch': + path => '/usr/bin:/usr/sbin:/bin', command => 'patch -d /usr/lib/python2.7/dist-packages -N -p1 < /usr/lib/python2.7/dist-packages/nova.patch', refreshonly => true, diff --git a/deployment_scripts/puppet/modules/vmware_dvs/manifests/init.pp b/deployment_scripts/puppet/modules/vmware_dvs/manifests/init.pp index b1ad58b..743a295 100644 --- a/deployment_scripts/puppet/modules/vmware_dvs/manifests/init.pp +++ b/deployment_scripts/puppet/modules/vmware_dvs/manifests/init.pp @@ -96,6 +96,7 @@ class vmware_dvs( notify => Exec['apply-nova-patch'], } exec {'apply-nova-patch': + path => '/usr/bin:/usr/sbin:/bin', command => 'patch -d /usr/lib/python2.7/dist-packages -N -p1 < /usr/lib/python2.7/dist-packages/nova.patch', refreshonly => true,