From ab1599765ca110f8a2e8f65b6977ac7a98c557c1 Mon Sep 17 00:00:00 2001 From: "Shnaidman Sagi (Sergey)" Date: Tue, 29 Dec 2020 15:15:57 +0000 Subject: [PATCH] Revert "Move CA cert injection to host_prep_tasks" This reverts commit 8e5d5283cc466b07616a57eeeee28859300022ab. Reason for revert: broke OVB periodic jobs Closes-Bug: #1908976 Change-Id: I9e8c2c96706e9abf9739b8a857231f522542fa5f --- deployment/certs/ca-certs-baremetal-puppet.yaml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/deployment/certs/ca-certs-baremetal-puppet.yaml b/deployment/certs/ca-certs-baremetal-puppet.yaml index a989c7e199..30deb5ec02 100644 --- a/deployment/certs/ca-certs-baremetal-puppet.yaml +++ b/deployment/certs/ca-certs-baremetal-puppet.yaml @@ -42,14 +42,6 @@ outputs: value: service_name: ca_certs config_settings: - 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} - + tripleo::trusted_cas::ca_map: {get_param: CAMap} + step_config: | + include tripleo::trusted_cas