From 761b90937d39cace5147ae373b869ccf1902da12 Mon Sep 17 00:00:00 2001
From: Pranali Deore <pdeore@redhat.com>
Date: Wed, 2 May 2018 18:27:00 +0530
Subject: [PATCH] Add node_staging_uri parameter

Adding node_staging_uri parameter to set the staging location
to /var/lib/staging/glance instead of the default one /tmp/staging
as it would be a shared across the nodes in case of 'glance-direct'
image import method.

Change-Id: Id9b35d5781448f22549d741ab797f656f96c6562
Closes-Bug: #1765439
---
 manifests/api.pp                | 7 +++++++
 spec/classes/glance_api_spec.rb | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/manifests/api.pp b/manifests/api.pp
index 74609350..589a2ebe 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -190,6 +190,11 @@
 #   (optional) Base directory that the Image Cache uses.
 #    Defaults to '/var/lib/glance/image-cache'.
 #
+# [*node_staging_uri*]
+# (optional) The URL provides location where the temporary data will be
+#  stored when image import method is set to 'glance-direct'
+#  Defaults to $::os_service_default.
+#
 # [*image_member_quota*]
 #   (optional) The maximum number of image members allowed per image.
 #    Defaults to $::os_service_default
@@ -343,6 +348,7 @@ class glance::api(
   $image_cache_max_size                 = $::os_service_default,
   $image_cache_stall_time               = $::os_service_default,
   $image_cache_dir                      = '/var/lib/glance/image-cache',
+  $node_staging_uri                     = $::os_service_default,
   $image_member_quota                   = $::os_service_default,
   $task_time_to_live                    = $::os_service_default,
   $task_executor                        = $::os_service_default,
@@ -398,6 +404,7 @@ class glance::api(
     'DEFAULT/scrub_time':              value => $scrub_time;
     'DEFAULT/delayed_delete':          value => $delayed_delete;
     'DEFAULT/image_cache_dir':         value => $image_cache_dir;
+    'DEFAULT/node_staging_uri':        value => $node_staging_uri;
     'DEFAULT/image_member_quota':      value => $image_member_quota;
     'DEFAULT/enable_v1_api':           value => $enable_v1_api;
     'DEFAULT/enable_v2_api':           value => $enable_v2_api;
diff --git a/spec/classes/glance_api_spec.rb b/spec/classes/glance_api_spec.rb
index df38d274..5a40ff5f 100644
--- a/spec/classes/glance_api_spec.rb
+++ b/spec/classes/glance_api_spec.rb
@@ -32,6 +32,7 @@ describe 'glance::api' do
       :scrub_time               => '<SERVICE DEFAULT>',
       :default_store            => false,
       :image_cache_dir          => '/var/lib/glance/image-cache',
+      :node_staging_uri         => '<SERVICE DEFAULT>',
       :image_member_quota       => '<SERVICE DEFAULT>',
       :image_cache_stall_time   => '<SERVICE DEFAULT>',
       :image_cache_max_size     => '<SERVICE DEFAULT>',
@@ -70,6 +71,7 @@ describe 'glance::api' do
         :delayed_delete           => 'true',
         :scrub_time               => '10',
         :image_cache_dir          => '/tmp/glance',
+        :node_staging_uri         => '/tmp/staging',
         :image_member_quota       => '128',
         :image_cache_stall_time   => '10',
         :image_cache_max_size     => '10737418240',
@@ -128,6 +130,7 @@ describe 'glance::api' do
             'delayed_delete',
             'scrub_time',
             'image_cache_dir',
+            'node_staging_uri',
             'image_member_quota',
             'enable_v1_api',
             'enable_v2_api',