x
/
fuel-plugin-openstack-telemetry
Code Issues Proposed changes

Merge "Fix metadata_fields computation in hiera.pp"

This commit is contained in:
Jenkins 2016-09-27 11:01:34 +00:00 committed by Gerrit Code Review
parent e1b55627f3 eb111bec36
commit c497aae121
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment_scripts/puppet/manifests/hiera.pp
View File

@ -111,14 +111,14 @@ $rabbit_password = $rabbit_info['password']
$rabbit_user = $rabbit_info['user']
$amqp_url = "amqp://${rabbit_user}:${rabbit_password}@${amqp_host}:${amqp_port}/"
# metadata_fields defitition
# metadata_fields definition
$metadata_fields_default = join(['status deleted container_format min_ram updated_at ',
'min_disk is_public size checksum created_at disk_format protected instance_host ',
'host display_name instance_id instance_type status state user_metadata.stack'])
$metadata_fields_plugin = $plugin_data['metadata_fields']
if ( $metadata_fields_plugin != '') {
$metadata_fields = concat([$plugin_data['metadata_fields']], " ",${metadata_fields_default}")
$metadata_fields = join(concat([$plugin_data['metadata_fields']], ' ', $metadata_fields_default))
}
else {
$metadata_fields = $metadata_fields_default