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

Fix hiera overrides for 8.0 

This change updates how we add our hiera override to support the
hiera.yaml format change in 8.0

Change-Id: Ib5203ab4684b7840c486aadc3ee3ca13ad1097a9
Related-Bug: #1526502
This commit is contained in:
Alex Schultz 2015-12-17 16:30:27 -07:00
parent a48f5b0579
commit 379ea16483
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
deployment_scripts/rabbitmq_hiera_override.pp
View File

@ -64,10 +64,20 @@ deploy_vrouter: <%= @deploy_vrouter %>
ensure => 'installed',
}
file_line {"${plugin_name}_hiera_override":
path => '/etc/hiera.yaml',
line => " - override/${plugin_name}",
after => ' - override/module/%{calling_module}',
# hiera file changes between 7.0 and 8.0 so we need to handle the override the
# 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",
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",
path => '/bin:/usr/bin',
unless => "grep -q '^ - override/${plugin_name}' /etc/hiera.yaml",
onlyif => 'grep -q "^ - override/plugins" /etc/hiera.yaml'
}
}