From 8e5d5283cc466b07616a57eeeee28859300022ab Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Tue, 28 Jul 2020 17:20:49 -0400 Subject: [PATCH] Move CA cert injection to host_prep_tasks See https://bugzilla.redhat.com/show_bug.cgi?id=1840886 Depends-On: https://review.opendev.org/#/c/743620/ Change-Id: Id9e14913168fd57c73d36f48aa6c31ac444d7ab3 --- deployment/certs/ca-certs-baremetal-puppet.yaml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/deployment/certs/ca-certs-baremetal-puppet.yaml b/deployment/certs/ca-certs-baremetal-puppet.yaml index 30deb5ec02..a989c7e199 100644 --- a/deployment/certs/ca-certs-baremetal-puppet.yaml +++ b/deployment/certs/ca-certs-baremetal-puppet.yaml @@ -42,6 +42,14 @@ outputs: value: service_name: ca_certs config_settings: - tripleo::trusted_cas::ca_map: {get_param: CAMap} - step_config: | - include tripleo::trusted_cas + description: Extra hieradata needed to inject CA certificates + value: null + host_prep_tasks: + description: Extra ansible tasks needed to inject CA certificates + value: + - name: inject CA certs into the system store + import_role: + name: tripleo_update_trusted_cas + vars: + tripleo_update_trusted_cas_ca_map: {get_param: CAMap} +