x
/
fuel-plugin-detach-rabbitmq
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: I246332de532b287b92ab308f031e42f9cca83d40
Closes-Bug: #1528215
Related-Bug: #1525014
This commit is contained in:
Alex Schultz 2015-12-21 09:03:27 -07:00
parent 379ea16483
commit f4de3f6f29
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/rabbitmq_hiera_override.pp
View File

@ -68,14 +68,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'