From 433e30db2fa9b18db583c888236fa411fa93a557 Mon Sep 17 00:00:00 2001
From: Flavio Percoco <flaper87@gmail.com>
Date: Wed, 23 Aug 2017 15:45:43 +0200
Subject: [PATCH] Now glance works

---
 tasks/hiera.yml     | 5 ++++-
 tasks/provision.yml | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tasks/hiera.yml b/tasks/hiera.yml
index 96496eb..91527ab 100644
--- a/tasks/hiera.yml
+++ b/tasks/hiera.yml
@@ -5,7 +5,9 @@
     hieradata: '{{hiera_data}}'
     hieradata_file: '{{hiera_data_file}}'
     schema:
-      glance::database_connection: database.connection
+# NOTE(flaper87): We should be able to use the connection
+# str coming from hiera. Let's use k8s' DNS for now.
+#      glance::database_connection: database.connection
 
       glance_log_file: DEFAULT.log_file
       glance::api::debug: DEFAULT.debug
@@ -42,6 +44,7 @@
       glance::notification_driver: oslo_messaging_notifications.driver
       glance::notification_topics: oslo_messaging_notifications.topics
 
+    default: '{{glance_config}}'
     fact_variable: 'glance_config'
 
 #           glance::policy::policies: {get_param: GlanceApiPolicies}
diff --git a/tasks/provision.yml b/tasks/provision.yml
index 14f1788..e3f60b6 100644
--- a/tasks/provision.yml
+++ b/tasks/provision.yml
@@ -56,7 +56,7 @@
     data:
       config.json: |
         {
-            "command": "/usr/sbin/httpd -DFOREGROUND",
+            "command": "glance-api --config-file /usr/share/glance/glance-api-dist.conf --config-file /etc/glance/glance-api.conf",
             "config_files": [
               {
                 "dest": "/etc/httpd/conf/httpd.conf",
@@ -75,7 +75,7 @@
                 "owner": "root",
                 "perm": "0644",
                 "source": "/var/lib/kolla/config_files/httpd-glance-main.conf"
-              },
+              }
             ]
         }
       glance-api.conf: |