x
/
fuel-plugin-detach-keystone
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: Ib44a98e81768dd69d947197612bc45c6ab857e23
Partial-Bug: #1540388
This commit is contained in:
Matthew Mosesohn 2016-02-03 18:55:39 +03:00
parent d47c9280d5
commit 0fcb14914f
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
deployment_scripts/hiera-override.pp
View File

@ -1,9 +1,9 @@
notice('MODULAR: detach-keystone/hiera-override.pp')
$detach_keystone_plugin = hiera('detach-keystone', undef)
$hiera_dir = '/etc/hiera/override'
$plugin_yaml = "detach-keystone.yaml"
$plugin_name = "detach-keystone"
$hiera_dir = '/etc/hiera/plugins'
$plugin_name = 'detach-keystone'
$plugin_yaml = "${plugin_name}.yaml"
if $detach_keystone_plugin {
$network_metadata = hiera_hash('network_metadata')
@ -153,23 +153,6 @@ amqp_hosts: <%= @amqp_hosts %>
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'
}
#FIXME(mattymo): https://bugs.launchpad.net/fuel/+bug/1479317
package { 'python-openstackclient':
ensure => latest,