heat sphinx doc
diff --git a/heat/meta/sensu.yml b/heat/meta/sensu.yml
new file mode 100644
index 0000000..ef37129
--- /dev/null
+++ b/heat/meta/sensu.yml
@@ -0,0 +1,19 @@
+check:
+ local_heat_api_cfn_proc:
+ command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C heat-api-cfn -u heat -c 1:10"
+ interval: 60
+ occurrences: 1
+ subscribers:
+ - local-heat-server
+ local_heat_engine:
+ command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C heat-engine -u heat -c 1:20"
+ interval: 60
+ occurrences: 1
+ subscribers:
+ - local-heat-server
+ local_heat_api:
+ command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C heat-api -u heat -c 1:10"
+ interval: 60
+ occurrences: 1
+ subscribers:
+ - local-heat-server
\ No newline at end of file
diff --git a/heat/meta/sphinx.yml b/heat/meta/sphinx.yml
index 13eac49..d3dbbe2 100644
--- a/heat/meta/sphinx.yml
+++ b/heat/meta/sphinx.yml
@@ -3,9 +3,46 @@
description: Heat implements an orchestration engine to launch multiple composite cloud applications based on templates in the form of text files that can be treated like code.
role:
{%- if pillar.heat.server is defined %}
+ {%- from "heat/map.jinja" import server with context %}
server:
name: server
- param: {}
+ endpoint:
+ heat_api:
+ name: heat-api
+ type: heat-api
+ address: http://{{ server.bind.api.address }}:8004
+ protocol: http
+ heat_api_cfn:
+ name: heat-api-cfn
+ type: heat-api-cfn
+ address: http://{{ server.bind.api_cfn.address }}:8003
+ protocol: http
+ heat_api_cloudwatch:
+ name: heat-api-cloudwatch
+ type: heat-api-cloudwatch
+ address: http://{{ server.bind.api_cloudwatch.address }}:8000
+ protocol: http
+ param:
+ bind:
+ value: {{ server.bind.api.address }}:8004
+ version:
+ name: "Version"
+ value: {{ server.version }}
+ database_host:
+ name: "Database"
+ value: {{ server.database.user }}@{{ server.database.host }}:{{ server.database.port }}//{{ server.database.name }}
+ message_queue_ip:
+ name: "Message queue"
+ value: {{ server.message_queue.user }}@{{ server.message_queue.host }}:{{ server.message_queue.port }}{{ server.message_queue.virtual_host }}
+ identity_host:
+ name: "Identity service"
+ value: {{ server.identity.user }}@{{ server.identity.host }}:{{ server.identity.port }}
+ packages:
+ value: |
+ {%- for pkg in server.pkgs %}
+ {%- set pkg_version = "dpkg -l "+pkg+" | grep "+pkg+" | awk '{print $3}'" %}
+ * {{ pkg }}: {{ salt['cmd.run'](pkg_version) }}
+ {%- endfor %}
{%- endif %}
{%- if pillar.heat.client is defined %}
client:
diff --git a/metadata/service/server/cluster.yml b/metadata/service/server/cluster.yml
index 8b28c60..adf8e66 100644
--- a/metadata/service/server/cluster.yml
+++ b/metadata/service/server/cluster.yml
@@ -1,5 +1,7 @@
applications:
- heat
+classes:
+- service.heat.support
parameters:
heat:
server:
diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index 999c448..9d07057 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -1,5 +1,7 @@
applications:
- heat
+classes:
+- service.heat.support
parameters:
heat:
server: