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

Use hiera/plugins directory instead of override 

hiera task now precreates an entry in /etc/hiera.yaml
for all plugins so that it is no longer necessary to
inject an override entry.

Change-Id: I90e20520420182f412e7062c423d608f41db2c99
Partial-Bug: #1540388
This commit is contained in:
Matthew Mosesohn 2016-02-03 19:14:24 +03:00
parent f4457eeac5
commit 847ba97771
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
deployment_scripts/database_hiera_override.pp
View File

@ -1,7 +1,7 @@
notice('MODULAR: detach-database/database_hiera_override.pp')
$detach_database_plugin = hiera('detach-database', undef)
$hiera_dir = '/etc/hiera/override'
$hiera_dir = '/etc/hiera/plugins'
$plugin_name = 'detach-database'
$plugin_yaml = "${plugin_name}.yaml"
@ -114,22 +114,4 @@ deploy_vrouter: <%= @deploy_vrouter %>
package {'ruby-deep-merge':
ensure => 'installed',
}
# 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 -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 -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'
}
}