x
/
fuel-plugin-detach-keystone
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: Ic2e620b5402c2fcd80bfe022c78d4fe800a5d568
Related-Bug: #1526502
This commit is contained in:
Alex Schultz 2015-12-17 16:32:48 -07:00
parent 73d541228d
commit 14aa54ba9c
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
deployment_scripts/hiera-override.pp
View File

@ -153,10 +153,21 @@ amqp_hosts: <%= @amqp_hosts %>
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'
}
#FIXME(mattymo): https://bugs.launchpad.net/fuel/+bug/1479317