openstack
/
puppet-glance
Code Issues Proposed changes

Set os_region_name to $::os_service_default and drop warning 

This commit [1] introduced a weird warning that send a warning by
default.

This patch:
* sets os_region_name to the default value in OpenStack using
  $::os_service_default
* drops the warning

[1] Id7a6894e5bb12fc7697dfe23e5f9d4a44a719086

Change-Id: Id4e94e18bad19c605bb82d3fb16b867493dab4c3
This commit is contained in:
Emilien Macchi 2016-01-03 10:47:47 -05:00
parent 5917ed6fb8
commit 17101434e1
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/registry.pp
View File

@ -151,7 +151,7 @@
#
# [*os_region_name*]
# (optional) Sets the keystone region to use.
# Defaults to 'RegionOne'.
# Defaults to $::os_service_default.
#
# [*signing_dir*]
# Directory used to cache files related to PKI tokens.
@ -196,7 +196,7 @@ class glance::registry(
$key_file = false,
$ca_file = false,
$sync_db = true,
$os_region_name = 'RegionOne',
$os_region_name = $::os_service_default,
$signing_dir = $::os_service_default,
$token_cache_time = $::os_service_default,
# DEPRECATED PARAMETERS
@ -232,8 +232,6 @@ class glance::registry(
require => Class['glance']
}
warning('Default value for os_region_name parameter is different from OpenStack project defaults')
glance_registry_config {
'DEFAULT/workers': value => $workers;
'DEFAULT/bind_host': value => $bind_host;

2
spec/classes/glance_registry_spec.rb
View File

@ -30,7 +30,7 @@ describe 'glance::registry' do
:keystone_password => 'ChangeMe',
:purge_config => false,
:sync_db => true,
:os_region_name => 'RegionOne',
:os_region_name => '<SERVICE DEFAULT>',
:signing_dir => '<SERVICE DEFAULT>',
:token_cache_time => '<SERVICE DEFAULT>',
}