From 0a71535c4ead69b3d93473d75f986c2b63ab0fd3 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Tue, 5 Sep 2017 09:58:09 +0300 Subject: [PATCH] Ensure novajoin's log directory ownership is correct From ocata to pike, the log ownership changed. So here we make sure that it changes on update via puppet. Change-Id: I767b53801bc40a22a403c3e89498c3aa099bc162 Closes-Bug: #1714991 --- manifests/metadata/novajoin/api.pp | 7 +++++++ spec/classes/nova_metadata_novajoin_api_spec.rb | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/manifests/metadata/novajoin/api.pp b/manifests/metadata/novajoin/api.pp index 5787cd65b..ddcef51f4 100644 --- a/manifests/metadata/novajoin/api.pp +++ b/manifests/metadata/novajoin/api.pp @@ -173,6 +173,13 @@ class nova::metadata::novajoin::api ( tag => ['openstack', 'novajoin-package'], } + file { '/var/log/novajoin': + ensure => directory, + owner => $service_user, + group => $service_user, + recurse => true, + } + if $ipa_domain != undef { novajoin_config { 'DEFAULT/domain': value => $ipa_domain; diff --git a/spec/classes/nova_metadata_novajoin_api_spec.rb b/spec/classes/nova_metadata_novajoin_api_spec.rb index 42f6af132..a53189ee6 100644 --- a/spec/classes/nova_metadata_novajoin_api_spec.rb +++ b/spec/classes/nova_metadata_novajoin_api_spec.rb @@ -136,6 +136,13 @@ describe 'nova::metadata::novajoin::api' do ) end + it { is_expected.to contain_file("/var/log/novajoin").with( + 'ensure' => 'directory', + 'owner' => "#{param_hash[:service_user]}", + 'group' => "#{param_hash[:service_user]}", + 'recurse' => true + )} + it { is_expected.to contain_file("#{param_hash[:keytab]}").with( 'owner' => "#{param_hash[:service_user]}", 'require' => 'Exec[get-service-user-keytab]',