From 2fa9b0b7585ec8b10c021bae0a12a47312442add Mon Sep 17 00:00:00 2001 From: Timo Goebel Date: Sat, 18 Mar 2017 17:20:12 +0100 Subject: [PATCH] remove dependencies to external modules --- .fixtures.yml | 1 - manifests/candlepin.pp | 2 -- manifests/foreman_proxy.pp | 6 +----- manifests/qpid.pp | 3 +-- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.fixtures.yml b/.fixtures.yml index 2bdfed36..1ff32193 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -2,7 +2,6 @@ fixtures: repositories: stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git" extlib: "https://github.com/puppet-community/puppet-extlib" - foreman: "https://github.com/theforeman/puppet-foreman.git" common: "https://github.com/katello/puppet-common.git" trusted_ca: "https://github.com/jlambert121/jlambert121-trusted_ca" concat: "https://github.com/puppetlabs/puppetlabs-concat" diff --git a/manifests/candlepin.pp b/manifests/candlepin.pp index 396220b7..e34cba0c 100644 --- a/manifests/candlepin.pp +++ b/manifests/candlepin.pp @@ -65,7 +65,6 @@ target => $keystore, owner => 'tomcat', group => $::certs::group, - notify => Service[$tomcat], } Cert[$java_client_cert_name] ~> @@ -108,7 +107,6 @@ owner => 'tomcat', group => $::certs::group, mode => '0640', - notify => Service[$tomcat], } } } diff --git a/manifests/foreman_proxy.pp b/manifests/foreman_proxy.pp index ebf530b3..34a2b2f5 100644 --- a/manifests/foreman_proxy.pp +++ b/manifests/foreman_proxy.pp @@ -72,23 +72,19 @@ Cert[$proxy_cert_name] ~> pubkey { $proxy_cert: key_pair => Cert[$proxy_cert_name], - notify => Service['foreman-proxy'], } ~> privkey { $proxy_key: key_pair => Cert[$proxy_cert_name], - notify => Service['foreman-proxy'], } -> pubkey { $proxy_ca_cert: key_pair => $::certs::default_ca, - notify => Service['foreman-proxy'], } ~> file { $proxy_key: ensure => file, owner => 'foreman-proxy', group => $::certs::group, mode => '0400', - } ~> - Service['foreman-proxy'] + } Cert[$foreman_proxy_client_cert_name] ~> pubkey { $foreman_ssl_cert: diff --git a/manifests/qpid.pp b/manifests/qpid.pp index 36882731..0c17cfef 100644 --- a/manifests/qpid.pp +++ b/manifests/qpid.pp @@ -97,8 +97,7 @@ command => "pk12util -i '${pfx_path}' -d '${::certs::nss_db_dir}' -w '${nss_db_password_file}' -k '${nss_db_password_file}'", path => '/usr/bin', refreshonly => true, - } ~> - Service['qpidd'] + } Pubkey[$::certs::ca_cert] ~> Certs::Ssltools::Certutil['ca'] Pubkey[$client_cert] ~> Certs::Ssltools::Certutil['broker']