From 4a4b68cc3cf9b2139bf790803d954fb582fdb47b Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Mon, 21 Dec 2015 09:05:55 -0700 Subject: [PATCH] Put plugin hiera in place This change updates corrects the sed used to update the hiera.yaml for the plugin to ensure the plugin hiera is actually defined. Change-Id: Iba038921724809198e93b7d37760bac1019af891 Closes-Bug: #1528215 Related-Bug: #1525014 --- deployment_scripts/database_hiera_override.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment_scripts/database_hiera_override.pp b/deployment_scripts/database_hiera_override.pp index 7340f18..b33e015 100644 --- a/deployment_scripts/database_hiera_override.pp +++ b/deployment_scripts/database_hiera_override.pp @@ -119,14 +119,14 @@ deploy_vrouter: <%= @deploy_vrouter %> # different yaml formats via these exec hacks. It should be noted that the # fuel hiera task will wipe out these this update to the hiera.yaml exec { "${plugin_name}_hiera_override_7.0": - command => "sed '/ - override\/plugins/a\ - override\/${plugin_name}' /etc/hiera.yaml", + command => "sed -i '/ - override\\/plugins/a\\ - override\\/${plugin_name}' /etc/hiera.yaml", path => '/bin:/usr/bin', unless => "grep -q '^ - override/${plugin_name}' /etc/hiera.yaml", onlyif => 'grep -q "^ - override/plugins" /etc/hiera.yaml' } exec { "${plugin_name}_hiera_override_8.0": - command => "sed '/ - override\/plugins/a\ - override\/${plugin_name}' /etc/hiera.yaml", + command => "sed -i '/ - override\\/plugins/a\\ - override\\/${plugin_name}' /etc/hiera.yaml", path => '/bin:/usr/bin', unless => "grep -q '^ - override/${plugin_name}' /etc/hiera.yaml", onlyif => 'grep -q "^ - override/plugins" /etc/hiera.yaml'