M/N upgrade fix galera restart.

[apex-tripleo-heat-templates.git] / puppet / manifests / overcloud_object.pp

diff --git a/puppet/manifests/overcloud_object.pp b/puppet/manifests/overcloud_object.pp
index cb0ea7c..414a06b 100644 (file)
--- a/puppet/manifests/overcloud_object.pp
+++ b/puppet/manifests/overcloud_object.pp
@@ -13,20 +13,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-include ::tripleo::packages
-include ::tripleo::firewall
-
-if hiera('step') >= 1 {
-  create_resources(kmod::load, hiera('kernel_modules'), {})
-  create_resources(sysctl::value, hiera('sysctl_settings'), {})
-  Exec <| tag == 'kmod::load' |>  -> Sysctl <| |>
-
-  include ::timezone
-
-}
-
 if hiera('step') >= 4 {
-  hiera_include('object_classes')
+  hiera_include('object_classes', [])
 }
 
-package_manifest{'/var/lib/tripleo/installed-packages/overcloud_object': ensure => present}
+$package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_object', hiera('step')])
+package_manifest{$package_manifest_name: ensure => present}