From feae1d9f83d460a74b2b9d8a6bfba2ed4a250e28 Mon Sep 17 00:00:00 2001
From: Flavio Percoco <flaper87@gmail.com>
Date: Wed, 1 Nov 2017 06:51:01 +0100
Subject: [PATCH] Don't use custom vars for hiera_data

The scope in an ansible execution is global, which means the hiera
module has access to the variables set in the execution. We don't need
to wrap the hiera_data variables.

Change-Id: Iec87c5c6e2d98aefc93d6f8726ad0ff5b0adaa4f
---
 defaults/main.yml |  3 ---
 tasks/hiera.yml   | 20 ++++++++++++++------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 3e34876..8bda0ed 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -6,9 +6,6 @@ action: provision
 service_name: mariadb
 namespace: openstack
 
-hiera_data: {}
-hiera_data_file: ''
-
 mariadb_config:
   host: '{{service_name}}'
   root_password: weakpassword
diff --git a/tasks/hiera.yml b/tasks/hiera.yml
index fe6a8c9..81e635b 100644
--- a/tasks/hiera.yml
+++ b/tasks/hiera.yml
@@ -1,9 +1,7 @@
 - name: Translate hieradata
-  include_role:
-    name: 'ansible-role-k8s-tripleo'
-  vars:
-    hieradata: '{{hiera_data}}'
-    hieradata_file: '{{hiera_data_file}}'
+  parse_tripleo_hiera:
+    hieradata_file: '{{ hieradata_file }}'
+    hieradata: '{{ hieradata }}'
     schema:
       tripleo::profile::base::database::mysql::bind_address: bind_address
       tripleo::profile::base::database::mysql::mysql_server_options: mysql_server_options
@@ -11,7 +9,17 @@
       mysql_clustercheck_password: clustercheck_password
       mysql_max_connections: mysql_max_connections
     default: '{{mariadb_config}}'
-    fact_variable: 'mariadb_config'
+  when:
+    - hieradata or hieradata_file
+    - schema
+  register: result
+
+- name: Set facts
+  set_fact:
+    mariadb_config: '{{result.conf_dict}}'
+  when:
+    - result.conf_dict is defined
+    - fact_variable != ''
 
 - debug:
     var: mariadb_config