Fix several typos in parameter descriptions.
Change-Id: I1c45f1fcb8663383b09014aa5095c9b0e99fb231
This commit is contained in:
parent
1c68ab1795
commit
c6a3840a8e
@ -279,7 +279,7 @@ Puppet::Type.type(:keystone_endpoint).provide(
|
||||
service = services.find { |s| s[:type] == type }
|
||||
service_id = ''
|
||||
if service.nil? && services.count == 1
|
||||
# For backward comptatibility, match the service by name only.
|
||||
# For backward compatibility, match the service by name only.
|
||||
service_id = services[0][:id]
|
||||
else
|
||||
# Math the service by id.
|
||||
|
@ -14,7 +14,7 @@ Puppet::Type.newtype(:keystone_domain_config) do
|
||||
end
|
||||
|
||||
# if one declare the domain directory as a resource, this will
|
||||
# create a soft dependancy with it.
|
||||
# create a soft dependency with it.
|
||||
autorequire(:file) do
|
||||
currently_defined = provider.class.find_domain_conf(catalog)
|
||||
# we use the catalog and fall back to provider.self.base_dir (see
|
||||
|
@ -112,7 +112,7 @@
|
||||
# Default to $::os_service_default
|
||||
#
|
||||
# [*tls_enabled*]
|
||||
# (Optional) Global toggle for TLS usage when comunicating with
|
||||
# (Optional) Global toggle for TLS usage when communicating with
|
||||
# the caching servers.
|
||||
# Default to $::os_service_default
|
||||
#
|
||||
@ -132,7 +132,7 @@
|
||||
#
|
||||
# [*tls_keyfile*]
|
||||
# (Optional) Path to a single file containing the client's private
|
||||
# key in. Otherwhise the private key will be taken from the file
|
||||
# key in. Otherwise the private key will be taken from the file
|
||||
# specified in tls_certfile. If tls_enabled is False, this option
|
||||
# is ignored.
|
||||
# Default to $::os_service_default
|
||||
@ -148,7 +148,7 @@
|
||||
# (Optional) Enable retry client mechanisms to handle failure.
|
||||
# Those mechanisms can be used to wrap all kind of pymemcache
|
||||
# clients. The wrapper allows you to define how many attempts
|
||||
# to make and how long to wait between attemots.
|
||||
# to make and how long to wait between attempts.
|
||||
# Default to $::os_service_default
|
||||
#
|
||||
# [*retry_attempts*]
|
||||
|
@ -51,7 +51,7 @@ class keystone::deps {
|
||||
# Support packages need to be installed in the install phase, but we don't
|
||||
# put them in the chain above because we don't want any false dependencies
|
||||
# between packages with the keystone-package tag and the keystone-support-package
|
||||
# tag. Note: the package resources here will have a 'before' relationshop on
|
||||
# tag. Note: the package resources here will have a 'before' relationship on
|
||||
# the keystone::install::end anchor. The line between keystone-support-package and
|
||||
# keystone-package should be whether or not keystone services would need to be
|
||||
# restarted if the package state was changed.
|
||||
@ -87,7 +87,7 @@ class keystone::deps {
|
||||
Anchor['keystone::config::end'] ~> Anchor['keystone::service::begin']
|
||||
|
||||
# Install the package before the Apache module purges wsgi-keystone.conf.
|
||||
# Otherwise, the run isn't indempotent.
|
||||
# Otherwise, the run isn't idempotent.
|
||||
Package<| tag == 'keystone-package'|> -> File<| title == '/etc/apache2/sites-enabled' |>
|
||||
Package<| tag == 'keystone-package'|> -> File<| title == '/etc/apache2/sites-available' |>
|
||||
|
||||
|
@ -33,7 +33,7 @@
|
||||
# Defaults to present.
|
||||
#
|
||||
# [*enable_websso*]
|
||||
# (optional) Wheater or not to enable Web Single Sign-On (SSO)
|
||||
# (optional) Whether or not to enable Web Single Sign-On (SSO)
|
||||
# Defaults to false
|
||||
#
|
||||
class keystone::federation::mellon (
|
||||
|
@ -14,7 +14,7 @@
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*disable_by_file_path*]
|
||||
# (Optional) Check the presense of a file to determine if an application
|
||||
# (Optional) Check the presence of a file to determine if an application
|
||||
# is running on a port.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
|
@ -95,7 +95,7 @@
|
||||
#
|
||||
# [*rabbit_use_ssl*]
|
||||
# (Optional) Connect over SSL for RabbitMQ
|
||||
# Defaults to $::os_serice_default
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*kombu_ssl_ca_certs*]
|
||||
# (Optional) SSL certification authority file (valid only if SSL enabled).
|
||||
|
@ -70,7 +70,7 @@
|
||||
# See https://docs.python.org/2/howto/logging.html
|
||||
#
|
||||
# [*default_log_levels*]
|
||||
# (0ptional) Hash of logger (keys) and level (values) pairs.
|
||||
# (Optional) Hash of logger (keys) and level (values) pairs.
|
||||
# Defaults to $::os_service_default
|
||||
# Example:
|
||||
# { 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN',
|
||||
|
@ -8,7 +8,7 @@ class keystone::params {
|
||||
$user = 'keystone'
|
||||
$group = 'keystone'
|
||||
|
||||
# NOTE(tkajinam) These are kept for backword compatibility
|
||||
# NOTE(tkajinam) These are kept for backward compatibility
|
||||
$keystone_user = $user
|
||||
$keystone_group = $group
|
||||
|
||||
|
@ -85,7 +85,7 @@
|
||||
# Defaults to '/usr/bin/keystone-wsgi-public'
|
||||
#
|
||||
# [*custom_wsgi_process_options*]
|
||||
# (Optional) gives you the oportunity to add custom process options or to
|
||||
# (Optional) gives you the opportunity to add custom process options or to
|
||||
# overwrite the default options for the WSGI process.
|
||||
# For example to use a virtual python environment for the WSGI process
|
||||
# you could set it to:
|
||||
|
@ -368,7 +368,7 @@ describe 'keystone server running with Apache/WSGI with resources' do
|
||||
# which doesn't exit. The next "test" clean everything up
|
||||
# to have a working keystone again.
|
||||
|
||||
# TODO: Sould we add a working ldap server ?
|
||||
# TODO: Should we add a working ldap server ?
|
||||
end
|
||||
|
||||
describe file('/etc/keystone/domains/keystone.domain_1_ldap_backend.conf') do
|
||||
|
@ -192,7 +192,7 @@ describe 'keystone::resource::authtoken' do
|
||||
end
|
||||
end
|
||||
|
||||
context 'by a commma-separated string' do
|
||||
context 'by a comma-separated string' do
|
||||
before do
|
||||
params.merge! ({
|
||||
:memcached_servers => '[fd12:3456:789a:1::1]:11211,[fd12:3456:789a:1::2]:11211',
|
||||
|
@ -101,7 +101,7 @@ end
|
||||
# attribute [Array[Hash]]
|
||||
# - the first hash are the expected result
|
||||
# - second are the combination of attributes you want to test
|
||||
# The provider must be build from ressource_attrs
|
||||
# The provider must be build from resource_attrs
|
||||
# see examples in keystone_{user/user_role/tenant/service}
|
||||
shared_examples_for 'create the correct resource' do |attributes|
|
||||
expected_results = attributes.shift['expected_results']
|
||||
|
Loading…
Reference in New Issue
Block a user