From: Emilien Macchi <emilien@redhat.com>
Date: Thu, 13 Jul 2017 18:26:54 +0000 (-0700)
Subject: Update resource references for dependencies
X-Git-Tag: opnfv-6.0.0~106^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3ee568800d9295bc2a4f843bd3ce74b109613c6b;p=apex-puppet-tripleo.git

Update resource references for dependencies

The latest version of puppet now reports these as catalog failures so
this change removes the unnecessary references and the references
should be updated.

Closes-Bug: #1702964
Change-Id: Iebc547aa92f9f40e4a633c57d79e6c9cddb5dd28
---

diff --git a/manifests/certmonger/ca/local.pp b/manifests/certmonger/ca/local.pp
index b7b7328..78dc09a 100644
--- a/manifests/certmonger/ca/local.pp
+++ b/manifests/certmonger/ca/local.pp
@@ -34,6 +34,6 @@ class tripleo::certmonger::ca::local(
     creates   => $ca_pem,
     tries     => 5,
     try_sleep => 1,
-    require   => Service['certmonger'],
   }
+  Service['certmonger'] ~> Exec<| title == 'extract-and-trust-ca' |>
 }
diff --git a/spec/classes/tripleo_certmonger_ca_local_spec.rb b/spec/classes/tripleo_certmonger_ca_local_spec.rb
index 7ee9383..b6ecebc 100644
--- a/spec/classes/tripleo_certmonger_ca_local_spec.rb
+++ b/spec/classes/tripleo_certmonger_ca_local_spec.rb
@@ -21,6 +21,11 @@ require 'spec_helper'
 describe 'tripleo::certmonger::ca::local' do
 
   shared_examples_for 'tripleo::certmonger::ca::local' do
+
+    let :pre_condition do
+      "include ::certmonger"
+    end
+
     let :params do
       {
         :ca_pem => '/etc/pki/ca-trust/source/anchors/cm-local-ca.pem',