openstack/puppet-manila
Code Issues Proposed changes

Merge "Add "host" parameter for manila.conf"

Browse Source
This commit is contained in:
Jenkins 2017-08-29 01:23:10 +00:00 committed by Gerrit Code Review
commit b7678412af
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/init.pp
View File

@ -220,6 +220,11 @@
# in the manila config. # in the manila config.
# Defaults to false. # Defaults to false.
# #
# [*host*]
# (optional) Name of this node. This can be an opaque identifier. It is
# not necessarily a host name, FQDN, or IP address.
# Defaults to $::os_service_default
#
# === DEPRECATED PARAMETERS # === DEPRECATED PARAMETERS
# #
# [*rabbit_host*] # [*rabbit_host*]
@ -304,6 +309,7 @@ class manila (
$amqp_username = $::os_service_default, $amqp_username = $::os_service_default,
$amqp_password = $::os_service_default, $amqp_password = $::os_service_default,
$purge_config = false, $purge_config = false,
$host = $::os_service_default,
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$rabbit_host = $::os_service_default, $rabbit_host = $::os_service_default,
$rabbit_port = $::os_service_default, $rabbit_port = $::os_service_default,
@ -402,6 +408,7 @@ manila::rpc_backend are deprecated. Please use manila::default_transport_url ins
'DEFAULT/storage_availability_zone': value => $storage_availability_zone; 'DEFAULT/storage_availability_zone': value => $storage_availability_zone;
'DEFAULT/rootwrap_config': value => $rootwrap_config; 'DEFAULT/rootwrap_config': value => $rootwrap_config;
'DEFAULT/state_path': value => $state_path; 'DEFAULT/state_path': value => $state_path;
'DEFAULT/host': value => $host;
} }
oslo::concurrency { 'manila_config': lock_path => $lock_path } oslo::concurrency { 'manila_config': lock_path => $lock_path }

5
releasenotes/notes/add_host_parameter-1a16fb834cc3ff98.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- Add new parameter "host", an opaque identifier for the node, not
necessarily a host name, FQDN, or IP address. May be used for more
than one node when these are in an HA cluster.

3
spec/classes/manila_init_spec.rb
View File

@ -85,6 +85,9 @@ describe 'manila' do
is_expected.to contain_manila_config('DEFAULT/state_path').with( is_expected.to contain_manila_config('DEFAULT/state_path').with(
:value => '/var/lib/manila' :value => '/var/lib/manila'
) )
is_expected.to contain_manila_config('DEFAULT/host').with(
:value => '<SERVICE DEFAULT>'
)
is_expected.to contain_manila_config('oslo_concurrency/lock_path').with( is_expected.to contain_manila_config('oslo_concurrency/lock_path').with(
:value => '/tmp/manila/manila_locks' :value => '/tmp/manila/manila_locks'
) )