openstack
/
heat-templates
Code Issues Proposed changes

Merge "Apply tripleo-image-elements fixes to agent configs"

This commit is contained in:
Jenkins 2016-05-24 03:25:45 +00:00 committed by Gerrit Code Review
parent d8f057ac7d c7adc9c1a9
commit 46d01aac66
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hot/software-config/boot-config/templates/fragments/configure_config_agent.sh
View File

@ -28,7 +28,7 @@ polling_interval = {{polling_interval}}
cachedir = {{cachedir}}
{{/cachedir}}
{{#collectors}}
collectors = {{collectors}}
collectors = {{.}}
{{/collectors}}
{{#cfn}}
@ -52,6 +52,15 @@ stack_id = {{stack_id}}
resource_name = {{resource_name}}
{{/heat}}
{{#zaqar}}
[zaqar]
auth_url = {{auth_url}}
user_id = {{user_id}}
password = {{password}}
project_id = {{project_id}}
queue_id = {{queue_id}}
{{/zaqar}}
{{#request}}
[request]
{{#metadata_url}}

11
hot/software-config/heat-container-agent/scripts/configure_container_agent.sh
View File

@ -42,7 +42,7 @@ polling_interval = {{polling_interval}}
cachedir = {{cachedir}}
{{/cachedir}}
{{#collectors}}
collectors = {{collectors}}
collectors = {{.}}
{{/collectors}}
{{#cfn}}
@ -66,6 +66,15 @@ stack_id = {{stack_id}}
resource_name = {{resource_name}}
{{/heat}}
{{#zaqar}}
[zaqar]
auth_url = {{auth_url}}
user_id = {{user_id}}
password = {{password}}
project_id = {{project_id}}
queue_id = {{queue_id}}
{{/zaqar}}
{{#request}}
[request]
{{#metadata_url}}