From 8636535f4ec3686d91d91722480afc6c6654da1c Mon Sep 17 00:00:00 2001
From: Roman Sokolkov <rsokolkov@mirantis.com>
Date: Tue, 12 Jul 2016 12:12:21 +0300
Subject: [PATCH] Workaround for fuel-library bug

https://bugs.launchpad.net/fuel/+bug/1598163

Change-Id: Ie9b6afc39395437c0bc85eada9bd24725b13159c
---
 deployment_scripts/puppet/manifests/hiera_override.pp | 8 ++++++++
 deployment_tasks.yaml                                 | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

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