Merge pull request #9 from dukov/master
Policy.json should be defined by user
diff --git a/glance/server.sls b/glance/server.sls
index 46215f1..63d0cbb 100644
--- a/glance/server.sls
+++ b/glance/server.sls
@@ -92,6 +92,7 @@
- name: glance-glare
- require_in:
- cmd: glance_install_database
+ - cmd: glance_load_metadatafs
- watch:
- file: /etc/glance/glance-glare.conf
@@ -126,6 +127,12 @@
- require:
- service: glance_services
+glance_load_metadatafs:
+ cmd.run:
+ - name: glance-manage db_load_metadefs
+ - require:
+ - cmd: glance_install_database
+
{%- if server.get('image_cache', {}).get('enabled', False) %}
glance_cron_glance-cache-pruner:
cron.present:
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index 06f1456..30f66d4 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -6,7 +6,7 @@
heka:
enabled: true
sensu:
- enabled: true
+ enabled: false
sphinx:
enabled: true
config: