diff --git a/deployment_scripts/puppet/manifests/hiera_override.pp b/deployment_scripts/puppet/manifests/hiera_override.pp index ef45ca5..e8f3231 100644 --- a/deployment_scripts/puppet/manifests/hiera_override.pp +++ b/deployment_scripts/puppet/manifests/hiera_override.pp @@ -16,3 +16,11 @@ file { "${hiera_dir}/${plugin_yaml}": ensure => file, content => template('plugin_cinder_netapp/cinder_netapp.yaml.erb'), } + +# Workaround for bug 1598163 +exec { 'patch_puppet_bug_1598163': + path => '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin', + cwd => '/etc/puppet/modules/osnailyfacter/manifests/globals', + command => "sed -i \"s/hiera('storage/hiera_hash('storage/\" globals.pp", + onlyif => "grep \"hiera('storage\" globals.pp" +} diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml index 62e8436..8c51645 100644 --- a/deployment_tasks.yaml +++ b/deployment_tasks.yaml @@ -4,7 +4,7 @@ version: 2.1.0 groups: [primary-controller] requires: [hiera] - required_for: [create-cinder-types] + required_for: [globals, create-cinder-types] parameters: puppet_manifest: puppet/manifests/hiera_override.pp puppet_modules: puppet/modules:/etc/puppet/modules