From 916cb243957f76d7d4bf546d7ca68ad71dffd9f3 Mon Sep 17 00:00:00 2001
From: Kiran Thyagaraja <kthyagaraja@gmail.com>
Date: Tue, 29 Aug 2017 03:36:23 +0000
Subject: [PATCH] Added few schemas

---
 defaults/main.yml |  2 +-
 tasks/hiera.yml   | 23 ++++++++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index e2f4381..c6d9ff8 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -10,7 +10,7 @@ cinder_db_password: cinderpass
 hiera_data: {}
 hiera_data_file: ''
 
-cinder_conf:
+cinder_config:
   DEFAULT:
     public_bind_host: "0.0.0.0"
   database:
diff --git a/tasks/hiera.yml b/tasks/hiera.yml
index 62d5a56..9fbadf4 100644
--- a/tasks/hiera.yml
+++ b/tasks/hiera.yml
@@ -5,12 +5,17 @@
     hieradata: '{{hiera_data}}'
     hieradata_file: '{{hiera_data_file}}'
     schema:
-      cinder::api::bind_port: DEFAULT.bind_port
-      cinder::notify::rabbitmq::rabbit_userid: oslo_messaging_rabbit.rabbit_userid
-      cinder::notify::rabbitmq::rabbit_port: oslo_messaging_rabbit.rabbit_port
-      cinder::notify::rabbitmq::rabbit_password: oslo_messaging_rabbit.rabbit_password
-      cinder::notify::rabbitmq::rabbit_use_ssl: oslo_messaging_rabbit.rabbit_use_ssl
-      cinder::notify::rabbitmq::rabbit_host: oslo_messaging_rabbit.rabbit_host
-      cinder::rabbit_userid: cinder_rabbit_user
-      cinder::rabbit_password: cinder_rabbit_password
-      cinder::rabbit_port: cinder_rabbit_port
+      cinder::api::bind_port: bind_port
+      cinder::rabbit_userid: oslo_messaging_rabbit.rabbit_userid
+      cinder::rabbit_port: oslo_messaging_rabbit.rabbit_port
+      cinder::rabbit_password: oslo_messaging_rabbit.rabbit_password
+      cinder::rabbit_use_ssl: oslo_messaging_rabbit.rabbit_use_ssl
+      cinder::rabbit_host: oslo_messaging_rabbit.rabbit_host
+      cinder::rabbit_heartbeat_timeout_threshold: oslo_messaging_rabbit.rabbit_heartbeat_timeout_threshold
+      cinder::glance::glance_api_servers: glance_api_servers
+      cinder::glance::glance_api_version: glance_api_version
+      cinder::database_connection: database.connection
+      cinder::db::database_max_retries: database.max_retries
+      cinder::db::database_db_max_retries: database.db_max_retries
+    default: '{{cinder_config}}'
+    fact_variable: 'cinder_config'