x
/
fuel-plugin-detach-keystone
Code Issues Proposed changes

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: I56b8e6447e201af3378826c539056ec5d8cca795
Closes-Bug: #1528215
Related-Bug: #1525014
This commit is contained in:
Alex Schultz 2015-12-21 09:06:44 -07:00
parent 14aa54ba9c
commit 1b52cf830a
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/hiera-override.pp
View File

@ -157,14 +157,14 @@ amqp_hosts: <%= @amqp_hosts %>
# 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'