diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-18 01:49:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-18 01:49:25 +0000 |
| commit | 87c08cb2f0f7e7c3807e291a6b14beabfa9291e0 (patch) | |
| tree | a9bae4ab7f7a49d7b6b316190d39fab0866f0d6a | |
| parent | 1b4effb7fde1bd330e3f59bcab8c7a7efd649d06 (diff) | |
| parent | 3ee568800d9295bc2a4f843bd3ce74b109613c6b (diff) | |
Merge "Update resource references for dependencies"
| -rw-r--r-- | manifests/certmonger/ca/local.pp | 2 | ||||
| -rw-r--r-- | spec/classes/tripleo_certmonger_ca_local_spec.rb | 5 |
2 files changed, 6 insertions, 1 deletions
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', |