openstack
/
tripleo-image-elements
Code Issues Proposed changes

Merge "Correct configuration of o-c-c collectors"

This commit is contained in:
Jenkins 2014-09-08 14:20:44 +00:00 committed by Gerrit Code Review
parent f1d096d95a 2246f184aa
commit 396bdbd9c5
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
elements/os-collect-config/README.md
View File

@ -9,7 +9,10 @@ Heat Metadata can be used to configure os-collect-config:
os-collect-config: os-collect-config:
command: os-refresh-config command: os-refresh-config
cachedir: /var/run/os-collect-config cachedir: /var/run/os-collect-config
collectors: heat_local,ec2,cfn collectors:
- heat_local
- ec2
- cfn
polling_interval: 300 polling_interval: 300
cfn: cfn:
metadata_url: http://foo:8000/v1 metadata_url: http://foo:8000/v1

2
elements/os-collect-config/os-apply-config/etc/os-collect-config.conf
View File

@ -13,7 +13,7 @@ polling_interval = {{polling_interval}}
cachedir = {{cachedir}} cachedir = {{cachedir}}
{{/cachedir}} {{/cachedir}}
{{#collectors}} {{#collectors}}
collectors = {{collectors}} collectors = {{.}}
{{/collectors}} {{/collectors}}
{{#cfn}} {{#cfn}}