From 075129286dd5f37433f6f6e11c22a29976f93144 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Thu, 23 Apr 2020 14:20:39 -0600
Subject: [PATCH] Add ansible hieradata file

Wire up ansible_managed hieradata and provide a default file.

NOTE: In stable/train the name of the role is tripleo-hieradata and not
tripleo_hieradata

Depends-On: https://review.opendev.org/#/c/723628/
Change-Id: If3226be3ac6b2596a13985fe226f23afc3458907
(cherry picked from commit 4407c54f6b29436dbd1a56f2645eec5b4b7ce357)
---
 common/hiera-steps-tasks.yaml | 4 ++++
 overcloud.j2.yaml             | 1 +
 2 files changed, 5 insertions(+)

diff --git a/common/hiera-steps-tasks.yaml b/common/hiera-steps-tasks.yaml
index bdb950d06a..af9b093bfc 100644
--- a/common/hiera-steps-tasks.yaml
+++ b/common/hiera-steps-tasks.yaml
@@ -28,3 +28,7 @@
       - service_configs
       - extraconfig
       - role_extraconfig
+- name: Ensure ansible_managed hieradata file exists
+  include_role:
+    name: tripleo-hieradata
+    tasks_from: ansible_hieradata.yml
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index df227500c5..fc59dbd361 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -593,6 +593,7 @@ resources:
           - '"%{::uuid}"'
           - fqdn
           - docker_puppet # Optionally provided by container-puppet.py
+          - ansible_managed
           - heat_config_%{::deploy_config_name}
           - config_step
           - role_extraconfig