Apply tripleo-image-elements fixes to agent configs
Fix configuration of os-collect-config collectors and add zaqar collector. Change-Id: Ia4ed349f34b407947f35e3efe228653506fc6775 Closes-Bug: #1567584
This commit is contained in:
parent
66c763f1bb
commit
c7adc9c1a9
|
@ -28,7 +28,7 @@ polling_interval = {{polling_interval}}
|
||||||
cachedir = {{cachedir}}
|
cachedir = {{cachedir}}
|
||||||
{{/cachedir}}
|
{{/cachedir}}
|
||||||
{{#collectors}}
|
{{#collectors}}
|
||||||
collectors = {{collectors}}
|
collectors = {{.}}
|
||||||
{{/collectors}}
|
{{/collectors}}
|
||||||
|
|
||||||
{{#cfn}}
|
{{#cfn}}
|
||||||
|
@ -52,6 +52,15 @@ stack_id = {{stack_id}}
|
||||||
resource_name = {{resource_name}}
|
resource_name = {{resource_name}}
|
||||||
{{/heat}}
|
{{/heat}}
|
||||||
|
|
||||||
|
{{#zaqar}}
|
||||||
|
[zaqar]
|
||||||
|
auth_url = {{auth_url}}
|
||||||
|
user_id = {{user_id}}
|
||||||
|
password = {{password}}
|
||||||
|
project_id = {{project_id}}
|
||||||
|
queue_id = {{queue_id}}
|
||||||
|
{{/zaqar}}
|
||||||
|
|
||||||
{{#request}}
|
{{#request}}
|
||||||
[request]
|
[request]
|
||||||
{{#metadata_url}}
|
{{#metadata_url}}
|
||||||
|
|
|
@ -42,7 +42,7 @@ polling_interval = {{polling_interval}}
|
||||||
cachedir = {{cachedir}}
|
cachedir = {{cachedir}}
|
||||||
{{/cachedir}}
|
{{/cachedir}}
|
||||||
{{#collectors}}
|
{{#collectors}}
|
||||||
collectors = {{collectors}}
|
collectors = {{.}}
|
||||||
{{/collectors}}
|
{{/collectors}}
|
||||||
|
|
||||||
{{#cfn}}
|
{{#cfn}}
|
||||||
|
@ -66,6 +66,15 @@ stack_id = {{stack_id}}
|
||||||
resource_name = {{resource_name}}
|
resource_name = {{resource_name}}
|
||||||
{{/heat}}
|
{{/heat}}
|
||||||
|
|
||||||
|
{{#zaqar}}
|
||||||
|
[zaqar]
|
||||||
|
auth_url = {{auth_url}}
|
||||||
|
user_id = {{user_id}}
|
||||||
|
password = {{password}}
|
||||||
|
project_id = {{project_id}}
|
||||||
|
queue_id = {{queue_id}}
|
||||||
|
{{/zaqar}}
|
||||||
|
|
||||||
{{#request}}
|
{{#request}}
|
||||||
[request]
|
[request]
|
||||||
{{#metadata_url}}
|
{{#metadata_url}}
|
||||||
|
|
Loading…
Reference in New Issue