Fix grains generation
diff --git a/horizon/meta/sensu.yml b/horizon/meta/sensu.yml
index d394a8f..0e83106 100644
--- a/horizon/meta/sensu.yml
+++ b/horizon/meta/sensu.yml
@@ -1,19 +1,20 @@
{%- from "linux/map.jinja" import network with context -%}
{%- from "horizon/map.jinja" import server with context -%}
+check:
{%- if server.app is defined %}
{%- for app_name, app in server.app.iteritems() %}
{%- set site = salt['pillar.get']('nginx:server:site:horizon_'+app_name) %}
-local_supervisor_server_service_horizon_{{ app_name }}.{{ network.fqdn }}:
- command: "PATH=$PATH:/etc/sensu/plugins check_supervisor_proc.py -p horizon_{{ app_name }}"
- interval: 60
- occurrences: 1
- subscribers:
- - {{ network.fqdn|replace('.', '-') }}
-remote_horizon_login_{{ app_name }}.{{ site.host.name }}:
- command: "PATH=$PATH:/usr/local/bin oschecks-check_horizon_login -E {{ site.host.name }} -U :::openstack.user::: -P :::openstack.password::: -c /tmp/check_horizon_{{ app_name }}.{{ site.host.name }}_cookieFile"
- interval: 120
- occurrences: 1
- subscribers:
- - remote-network
+ local_supervisor_server_service_horizon_{{ app_name }}.{{ network.fqdn }}:
+ command: "PATH=$PATH:/etc/sensu/plugins check_supervisor_proc.py -p horizon_{{ app_name }}"
+ interval: 60
+ occurrences: 1
+ subscribers:
+ - {{ network.fqdn|replace('.', '-') }}
+ remote_horizon_login_{{ app_name }}.{{ site.host.name }}:
+ command: "PATH=$PATH:/usr/local/bin oschecks-check_horizon_login -E {{ site.host.name }} -U :::openstack.user::: -P :::openstack.password::: -c /tmp/check_horizon_{{ app_name }}.{{ site.host.name }}_cookieFile"
+ interval: 120
+ occurrences: 1
+ subscribers:
+ - remote-network
{%- endfor %}
{%- endif %}
diff --git a/horizon/meta/sphinx.yml b/horizon/meta/sphinx.yml
index 8bfdedc..2c05cb4 100644
--- a/horizon/meta/sphinx.yml
+++ b/horizon/meta/sphinx.yml
@@ -1,15 +1,16 @@
{%- from "horizon/map.jinja" import server with context %}
-name: Horizon
-description: Horizon is the canonical implementation of OpenStack’s Dashboard, which provides a web based user interface to OpenStack services including Nova, Swift, Keystone, etc.
-role:
- server:
- name: server
- param: {}
- endpoint:
- {%- for app_name, app in server.get('app', {}).iteritems() %}
- horizon_{{ app_name }}:
- name: {{ app_name }}
- type: horizon
- address: "http://{{ app.bind.address }}:{{ app.bind.port }}/"
- protocol: http
- {%- endfor %}
\ No newline at end of file
+doc:
+ name: Horizon
+ description: Horizon is the canonical implementation of OpenStack’s Dashboard, which provides a web based user interface to OpenStack services including Nova, Swift, Keystone, etc.
+ role:
+ server:
+ name: server
+ param: {}
+ endpoint:
+ {%- for app_name, app in server.get('app', {}).iteritems() %}
+ horizon_{{ app_name }}:
+ name: {{ app_name }}
+ type: horizon
+ address: "http://{{ app.bind.address }}:{{ app.bind.port }}/"
+ protocol: http
+ {%- endfor %}
\ No newline at end of file