Skip to content

Commit

Permalink
Use implicit dependency chaining on puppet
Browse files Browse the repository at this point in the history
theforeman/puppet-puppet@2fb8ad5
ensures the puppet user is always managed. This means the file resource
will autorequire the user causing the chaining to work.
  • Loading branch information
ekohl committed Oct 6, 2017
1 parent 27d497c commit 72ba978
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 27 deletions.
2 changes: 0 additions & 2 deletions .fixtures.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,5 @@ fixtures:
common: "https://github.com/katello/puppet-common.git"
trusted_ca: "https://github.com/jlambert121/jlambert121-trusted_ca"
concat: "https://github.com/puppetlabs/puppetlabs-concat"
apache: "https://github.com/puppetlabs/puppetlabs-apache"
puppet: "https://github.com/theforeman/puppet-puppet"
symlinks:
certs: "#{source_dir}"
7 changes: 3 additions & 4 deletions manifests/puppet.pp
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,9 @@

if $deploy {
file { "${pki_dir}/puppet":
ensure => directory,
owner => 'puppet',
mode => '0700',
require => Class['puppet::server::install'],
ensure => directory,
owner => 'puppet',
mode => '0700',
} ->
certs::keypair { 'puppet':
key_pair => $puppet_client_cert_name,
Expand Down
11 changes: 0 additions & 11 deletions spec/classes/certs_foreman_proxy_content_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,6 @@
on_supported_os['redhat-7-x86_64']
end

let :pre_condition do
"
package{ 'qpid-cpp-server': }
class { 'puppet':
server_foreman => false,
agent => false,
server => true,
}
"
end

let :params do
{
:certs_tar => '/tmp/tar'
Expand Down
10 changes: 0 additions & 10 deletions spec/classes/certs_puppet_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,6 @@
on_supported_os['redhat-7-x86_64']
end

let :pre_condition do
"
class { 'puppet':
server_foreman => false,
agent => false,
server => true,
}
"
end

describe 'with default parameters' do
it { should compile.with_all_deps }
end
Expand Down

0 comments on commit 72ba978

Please sign in to comment.