From eb111bec36ea84e6ad62ea54ad48fbb25867c792 Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Tue, 27 Sep 2016 10:52:03 +0200 Subject: [PATCH] Fix metadata_fields computation in hiera.pp Change-Id: Ifc7082cbc3173731c34f5f4e42275a44f93367e3 --- deployment_scripts/puppet/manifests/hiera.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment_scripts/puppet/manifests/hiera.pp b/deployment_scripts/puppet/manifests/hiera.pp index 4c44e4b..1c7f1f9 100644 --- a/deployment_scripts/puppet/manifests/hiera.pp +++ b/deployment_scripts/puppet/manifests/hiera.pp @@ -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