From 7c2541db550a770c972f2707ddb5a4742e1e1599 Mon Sep 17 00:00:00 2001
From: Evgeny Antyshev <eantyshev@virtuozzo.com>
Date: Wed, 31 May 2017 13:01:39 +0000
Subject: [PATCH] Pass qcow2 image properties to UEC image too

In case some additional properties required for a QCOW2 image
(for example, hw_disk_bus customization, etc.),
the same properties should be applied to UEC image.

Change-Id: Ide48dde4cd679bbfb887940baf66248c2d3931fb
---
 .../modules/packstack/manifests/provision/glance.pp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/packstack/puppet/modules/packstack/manifests/provision/glance.pp b/packstack/puppet/modules/packstack/manifests/provision/glance.pp
index b620cd78e..4eb0785e9 100644
--- a/packstack/puppet/modules/packstack/manifests/provision/glance.pp
+++ b/packstack/puppet/modules/packstack/manifests/provision/glance.pp
@@ -38,6 +38,15 @@ class packstack::provision::glance ()
         source           => $uec_image_source_ramdisk,
         id               => '0b50e2e5-1440-4654-b568-4e120ddf28c1'
       }
+      $uec_properties = { 'kernel_id' => '146d4a6b-ad1e-4d9f-8b08-98eae3c3dab4',
+                          'ramdisk_id' => '0b50e2e5-1440-4654-b568-4e120ddf28c1' }
+      # Same properties we require for QCOW2 image, we need for UEC image too
+      if $image_format == 'qcow2' {
+        $image_properties_hash = $image_properties.split(',').map |$tok| { $tok.split('=') }.flatten.hash
+        $uec_properties_all = $uec_properties.merge($image_properties_hash)
+      } else {
+        $uec_properties_all = $uec_properties
+      }
 
       glance_image{$uec_image_name:
         ensure           => present,
@@ -45,7 +54,7 @@ class packstack::provision::glance ()
         container_format => 'ami',
         disk_format      => 'qcow2',
         source           => $uec_image_source_disk,
-        properties       => { 'kernel_id' => '146d4a6b-ad1e-4d9f-8b08-98eae3c3dab4', 'ramdisk_id' => '0b50e2e5-1440-4654-b568-4e120ddf28c1' },
+        properties       => $uec_properties_all,
         require          => [ Glance_image["${uec_image_name}-kernel"], Glance_image["${uec_image_name}-ramdisk"] ]
       }
 
@@ -59,7 +68,7 @@ class packstack::provision::glance ()
         # See https://bugs.launchpad.net/cinder/+bug/1693926
         disk_format      => 'qcow2',
         source           => $uec_image_source_disk,
-        properties       => { 'kernel_id' => '146d4a6b-ad1e-4d9f-8b08-98eae3c3dab4', 'ramdisk_id' => '0b50e2e5-1440-4654-b568-4e120ddf28c1' },
+        properties       => $uec_properties_all,
         require          => [ Glance_image["${uec_image_name}-kernel"], Glance_image["${uec_image_name}-ramdisk"] ]
       }