Skip to content

Commit 45407f8

Browse files
authored
Stop managing vardir as a resource
1 parent 7e2be09 commit 45407f8

File tree

2 files changed

+1
-13
lines changed

2 files changed

+1
-13
lines changed

manifests/server/config.pp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -229,20 +229,14 @@
229229
}
230230

231231
if $puppet::server::git_repo {
232-
file { $puppet::vardir:
233-
ensure => directory,
234-
owner => 'root',
235-
group => 'root',
236-
}
237-
238232
vcsrepo { 'puppet_repo':
239233
ensure => 'bare',
240234
provider => 'git',
241235
path => $puppet::server::git_repo_path,
242236
user => $puppet::server::git_repo_user,
243237
group => $puppet::server::git_repo_group,
244238
umask => $puppet::server::git_repo_umask,
245-
require => File[$puppet::vardir, $primary_envs_dir],
239+
require => File[$primary_envs_dir],
246240
}
247241

248242
$git_branch_map = $puppet::server::git_branch_map

spec/classes/puppet_server_spec.rb

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -350,12 +350,6 @@
350350
.that_requires('Package[git]')
351351
end
352352

353-
it do
354-
should contain_file(vardir)
355-
.with_ensure('directory')
356-
.with_owner('root')
357-
end
358-
359353
it do
360354
should contain_vcsrepo('puppet_repo')
361355
.with_ensure('bare')

0 commit comments

Comments
 (0)