integ/config/puppet-modules/openstack/puppet-glance-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch

From 77f605262cdf55929b230033faafce04399828e6 Mon Sep 17 00:00:00 2001
From: Daniel Badea <daniel.badea@windriver.com>
Date: Mon, 30 Oct 2017 14:46:53 +0200
Subject: [PATCH] Roll up TIS patches

---
 lib/puppet/provider/glance_image/openstack.rb |  2 +-
 manifests/api.pp                              | 30 ++++++++++++++++++++++
 manifests/db/sync.pp                          |  3 +++
 manifests/registry.pp                         |  8 ++++++
 spec/classes/glance_api_spec.rb               |  3 +++
 spec/classes/glance_registry_spec.rb          |  1 +
 6 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/lib/puppet/provider/glance_image/openstack.rb b/lib/puppet/provider/glance_image/openstack.rb
index 6e6b4b9..4f30980 100644
--- a/lib/puppet/provider/glance_image/openstack.rb
+++ b/lib/puppet/provider/glance_image/openstack.rb
@@ -10,7 +10,7 @@ Puppet::Type.type(:glance_image).provide(
     Provider to manage glance_image type.
   EOT
 
-  @credentials = Puppet::Provider::Openstack::CredentialsV2_0.new
+  @credentials = Puppet::Provider::Openstack::CredentialsV3.new
 
   # TODO(flaper87): v2 is now the default. Force the use of v2,
   # to avoid supporting both versions and other edge cases.
diff --git a/manifests/api.pp b/manifests/api.pp
index 7e5d3f0..d69059d 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -271,6 +271,25 @@
 #   (optional) Maximum number of results that could be returned by a request
 #   Default: $::os_service_default.
 #
+#  === WRS parameters:
+#
+# [*cinder_catalog_info*]
+#   (optional) Info to match when looking for cinder in the service catalog.
+#   Defaults to 'volume:cinder:publicURL'.
+#
+# [*scrubber_datadir*]
+#   (optional) Some sort of scrubber datadir.
+#   Defaults to '/var/lib/glance/scrubber'.
+#
+# [*cache_raw_conversion_dir*]
+#   (optional) Base directory for Ceph RAW Caching feature
+#   Defaults to false, not set. RAW Caching will be disabled.
+#
+# [*graceful_shutdown*]
+#    (optional) Enable graceful shutdown on SIGUSR2
+#   Defaults to false, not set.
+#
+#
 #  === deprecated parameters:
 #
 # [*known_stores*]
@@ -339,6 +358,11 @@ class glance::api(
   $validation_options                   = {},
   $limit_param_default                  = $::os_service_default,
   $api_limit_max                        = $::os_service_default,
+  # WRS PARAMETERS
+  $cinder_catalog_info      = 'volume:cinder:publicURL',
+  $scrubber_datadir         = '/var/lib/glance/scrubber',
+  $cache_raw_conversion_dir = '/opt/img-conversions/glance',
+  $graceful_shutdown        = false,
   # DEPRECATED PARAMETERS
   $known_stores                         = false,
 ) inherits glance {
@@ -379,6 +403,10 @@ class glance::api(
     'DEFAULT/enable_v2_api':           value => $enable_v2_api;
     'DEFAULT/limit_param_default':     value => $limit_param_default;
     'DEFAULT/api_limit_max':           value => $api_limit_max;
+    'DEFAULT/cinder_catalog_info':     value => $cinder_catalog_info;
+    'DEFAULT/scrubber_datadir':        value => $scrubber_datadir;
+    'DEFAULT/cache_raw_conversion_dir': value=> $cache_raw_conversion_dir;
+    'DEFAULT/graceful_shutdown':       value => $graceful_shutdown;
     'glance_store/os_region_name':     value => $os_region_name;
   }
 
@@ -403,6 +431,8 @@ class glance::api(
   }
   if $default_store {
     $default_store_real = $default_store
+  } else {
+    $default_store_real = unset
   }
   if !empty($stores_real) {
     # determine value for glance_store/stores
diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp
index 357be0d..43f6168 100644
--- a/manifests/db/sync.pp
+++ b/manifests/db/sync.pp
@@ -30,6 +30,9 @@ class glance::db::sync(
       Anchor['glance::dbsync::begin']
     ],
     notify      => Anchor['glance::dbsync::end'],
+    # Only do the db sync if both controllers are running the same software
+    # version. Avoids impacting mate controller during an upgrade.
+    onlyif      => "test $::controller_sw_versions_match = true",
   }
 
 }
diff --git a/manifests/registry.pp b/manifests/registry.pp
index 258fd01..6adfc09 100644
--- a/manifests/registry.pp
+++ b/manifests/registry.pp
@@ -121,6 +121,11 @@
 #    should be set to False.
 #    Defaults to $::os_service_default.
 #
+# [*graceful_shutdown*]
+#    (optional) Enable graceful shutdown on SIGUSR2
+#   Defaults to false, not set.
+#
+#
 # DEPRECATED PARAMETERS
 #
 # [*sync_db*]
@@ -155,6 +160,8 @@ class glance::registry(
   $ca_file                 = $::os_service_default,
   $os_region_name          = $::os_service_default,
   $enable_v1_registry      = $::os_service_default,
+  # WRS PARAMETERS
+  $graceful_shutdown       = false,
   # DEPRECATED
   $sync_db                 = undef,
 ) inherits glance {
@@ -181,6 +188,7 @@ class glance::registry(
     'DEFAULT/bind_host':              value => $bind_host;
     'DEFAULT/bind_port':              value => $bind_port;
     'DEFAULT/enable_v1_registry':     value => $enable_v1_registry;
+    'DEFAULT/graceful_shutdown':      value => $graceful_shutdown;
     'glance_store/os_region_name':    value => $os_region_name;
   }
 
diff --git a/spec/classes/glance_api_spec.rb b/spec/classes/glance_api_spec.rb
index 9606b1d..eaf1373 100644
--- a/spec/classes/glance_api_spec.rb
+++ b/spec/classes/glance_api_spec.rb
@@ -34,6 +34,8 @@ describe 'glance::api' do
       :image_cache_dir          => '/var/lib/glance/image-cache',
       :image_cache_stall_time   => '<SERVICE DEFAULT>',
       :image_cache_max_size     => '<SERVICE DEFAULT>',
+      :cache_raw_conversion_dir => '/opt/img-conversions/glance',
+      :graceful_shutdown        => 'false',
       :os_region_name           => 'RegionOne',
       :pipeline                 => 'keystone',
       :task_time_to_live        => '<SERVICE DEFAULT>',
@@ -71,6 +73,7 @@ describe 'glance::api' do
         :image_cache_dir          => '/tmp/glance',
         :image_cache_stall_time   => '10',
         :image_cache_max_size     => '10737418240',
+        :cache_raw_conversion_dir => '/opt/img-conversions/glance',
         :os_region_name           => 'RegionOne2',
         :pipeline                 => 'keystone2',
         :sync_db                  => false,
diff --git a/spec/classes/glance_registry_spec.rb b/spec/classes/glance_registry_spec.rb
index 0d55cf5..4056f11 100644
--- a/spec/classes/glance_registry_spec.rb
+++ b/spec/classes/glance_registry_spec.rb
@@ -25,6 +25,7 @@ describe 'glance::registry' do
       :cert_file              => '<SERVICE DEFAULT>',
       :key_file               => '<SERVICE DEFAULT>',
       :enable_v1_registry     => '<SERVICE DEFAULT>',
+      :graceful_shutdown      => 'false',
     }
   end
 
-- 
2.7.4