sphinx documenation for glance
diff --git a/glance/meta/sensu.yml b/glance/meta/sensu.yml
new file mode 100644
index 0000000..cbe9ffc
--- /dev/null
+++ b/glance/meta/sensu.yml
@@ -0,0 +1,31 @@
+check:
+ local_glance_api_proc:
+ command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C glance-api -u glance -c 1:20"
+ interval: 60
+ occurrences: 1
+ subscribers:
+ - local-glance-server
+ local_glance_registry_proc:
+ command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C glance-registry -u glance -c 1:10"
+ interval: 60
+ occurrences: 1
+ subscribers:
+ - local-glance-server
+ remote_openstack_glance_api:
+ command: 'PATH=$PATH:/usr/local/bin oschecks-check_glance_api --os_auth_url="http://:::openstack.host::::5000/v2.0" --os_username=:::openstack.user::: --os_password=":::openstack.password:::" --os_tenant_name=:::openstack.tenant:::'
+ interval: 60
+ occurrences: 1
+ subscribers:
+ - remote-network
+ remote_openstack_glance_image_exists:
+ command: 'PATH=$PATH:/usr/local/bin oschecks-check_glance_image_exists --os_auth_url="http://:::openstack.host::::5000/v2.0" --os_username=:::openstack.user::: --os_password=":::openstack.password:::" --os_tenant_name=:::openstack.tenant:::'
+ interval: 120
+ occurrences: 1
+ subscribers:
+ - remote-network
+ remote_openstack_glance_upload:
+ command: 'PATH=$PATH:/usr/local/bin oschecks-check_glance_upload --os_auth_url="http://:::openstack.host::::5000/v2.0" --os_username=:::openstack.user::: --os_password=":::openstack.password:::" --os_tenant_name=:::openstack.tenant:::'
+ interval: 300
+ occurrences: 1
+ subscribers:
+ - remote-network
\ No newline at end of file
diff --git a/glance/meta/sphinx.yml b/glance/meta/sphinx.yml
index 46a2b31..58d95fd 100644
--- a/glance/meta/sphinx.yml
+++ b/glance/meta/sphinx.yml
@@ -3,7 +3,42 @@
description: The Glance project provides services for discovering, registering, and retrieving virtual machine images.
role:
{%- if pillar.glance.server is defined %}
+ {%- from "glance/map.jinja" import server with context %}
server:
name: server
- param: {}
+ endpoint:
+ glance_api:
+ name: glance-api
+ type: glance-api
+ address: http://{{ server.bind.address }}:{{ server.bind.port }}
+ protocol: http
+ glance_registry:
+ name: glance-registry
+ type: glance-registry
+ address: http://{{ server.registry.host }}:{{ server.registry.port }}
+ protocol: http
+ param:
+ bind:
+ value: {{ server.bind.address }}:{{ server.bind.port }}
+ 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 }}
+ storage_engine:
+ name: "Glance storage engine"
+ value: {{ server.storage.engine }}
+ 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 %}
\ No newline at end of file
diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index 5990e08..0930a18 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -1,5 +1,7 @@
applications:
- glance
+classes:
+- service.glance.support
parameters:
glance:
server:
diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
index 6f10628..917a4ce 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -1,5 +1,7 @@
applications:
- glance
+classes:
+- service.glance.support
parameters:
glance:
server: