openstack/puppet-trove
Code Issues Proposed changes

Replace legacy facts and use fact hash

Browse Source 
... because the latest lint no longer allows usage of legacy facts and
top scope fact.

This also fixes the wrong wsgi script name introduced by [1] to fix
broken litmus jobs.

[1] d7a1ea5fb7

Change-Id: Idb7d655242ccd6f785ea4dfbb94d8ff3ad961b03
This commit is contained in:
Takashi Kajinami 2023-03-02 12:41:41 +09:00
parent c9da126ea7
commit 505c5dbbe4
23 changed files with 317 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
manifests/api.pp
View File

@ -40,19 +40,19 @@
# #
# [*bind_host*] # [*bind_host*]
# (optional) The address of the host to bind to. # (optional) The address of the host to bind to.
# Default: $::os_service_default # Default: $facts['os_service_default']
# #
# [*bind_port*] # [*bind_port*]
# (optional) The port the server should bind to. # (optional) The port the server should bind to.
# Default: $::os_service_default # Default: $facts['os_service_default']
# #
# [*backlog*] # [*backlog*]
# (optional) Backlog requests when creating socket # (optional) Backlog requests when creating socket
# Default: $::os_service_default # Default: $facts['os_service_default']
# #
# [*workers*] # [*workers*]
# (optional) Number of trove API worker processes to start # (optional) Number of trove API worker processes to start
# Default: $::os_workers # Default: $facts['os_workers']
# #
# [*enabled*] # [*enabled*]
# (optional) Whether to enable services. # (optional) Whether to enable services.
@ -77,23 +77,23 @@
# #
# [*http_get_rate*] # [*http_get_rate*]
# (optional) Default rate limit of GET request. # (optional) Default rate limit of GET request.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*http_post_rate*] # [*http_post_rate*]
# (optional) Default rate limit of POST request. # (optional) Default rate limit of POST request.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*http_put_rate*] # [*http_put_rate*]
# (optional) Default rate limit of PUT request. # (optional) Default rate limit of PUT request.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*http_delete_rate*] # [*http_delete_rate*]
# (optional) Default rate limit of DELETE request. # (optional) Default rate limit of DELETE request.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*http_mgmt_post_rate*] # [*http_mgmt_post_rate*]
# (optional) Default rate limit of mgmt post request. # (optional) Default rate limit of mgmt post request.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*auth_strategy*] # [*auth_strategy*]
# (optional) The strategy to use for authentication. # (optional) The strategy to use for authentication.
@ -101,28 +101,28 @@
# #
# [*taskmanager_queue*] # [*taskmanager_queue*]
# (optional) Message queue name the Taskmanager will listen to. # (optional) Message queue name the Taskmanager will listen to.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
class trove::api( class trove::api(
$manage_service = true, $manage_service = true,
$service_name = $::trove::params::api_service_name, $service_name = $::trove::params::api_service_name,
$package_ensure = 'present', $package_ensure = 'present',
$bind_host = $::os_service_default, $bind_host = $facts['os_service_default'],
$bind_port = $::os_service_default, $bind_port = $facts['os_service_default'],
$backlog = $::os_service_default, $backlog = $facts['os_service_default'],
$workers = $::os_workers, $workers = $facts['os_workers'],
$enabled = true, $enabled = true,
$purge_config = false, $purge_config = false,
$cert_file = false, $cert_file = false,
$key_file = false, $key_file = false,
$ca_file = false, $ca_file = false,
$http_get_rate = $::os_service_default, $http_get_rate = $facts['os_service_default'],
$http_post_rate = $::os_service_default, $http_post_rate = $facts['os_service_default'],
$http_put_rate = $::os_service_default, $http_put_rate = $facts['os_service_default'],
$http_delete_rate = $::os_service_default, $http_delete_rate = $facts['os_service_default'],
$http_mgmt_post_rate = $::os_service_default, $http_mgmt_post_rate = $facts['os_service_default'],
$auth_strategy = 'keystone', $auth_strategy = 'keystone',
$taskmanager_queue = $::os_service_default, $taskmanager_queue = $facts['os_service_default'],
) inherits trove::params { ) inherits trove::params {
include trove::deps include trove::deps

8
manifests/api/service_credentials.pp
View File

@ -31,7 +31,7 @@
# #
# [*system_scope*] # [*system_scope*]
# (optional) Scope for system operations. # (optional) Scope for system operations.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
class trove::api::service_credentials ( class trove::api::service_credentials (
$password, $password,
@ -41,7 +41,7 @@ class trove::api::service_credentials (
$project_name = 'services', $project_name = 'services',
$project_domain_name = 'Default', $project_domain_name = 'Default',
$user_domain_name = 'Default', $user_domain_name = 'Default',
$system_scope = $::os_service_default, $system_scope = $facts['os_service_default'],
) { ) {
include trove::deps include trove::deps
@ -50,8 +50,8 @@ class trove::api::service_credentials (
$project_name_real = $project_name $project_name_real = $project_name
$project_domain_name_real = $project_domain_name $project_domain_name_real = $project_domain_name
} else { } else {
$project_name_real = $::os_service_default $project_name_real = $facts['os_service_default']
$project_domain_name_real = $::os_service_default $project_domain_name_real = $facts['os_service_default']
} }
trove_config { trove_config {

12
manifests/conductor.pp
View File

@ -22,24 +22,24 @@
# #
# [*workers*] # [*workers*]
# (optional) Number of trove conductor worker processes to start # (optional) Number of trove conductor worker processes to start
# Default: $::os_workers # Default: $facts['os_workers']
# #
# [*enable_profiler*] # [*enable_profiler*]
# (optional) If False fully disable profiling feature. # (optional) If False fully disable profiling feature.
# Default: $::os_service_default # Default: $facts['os_service_default']
# #
# [*trace_sqlalchemy*] # [*trace_sqlalchemy*]
# (optional) If False doesn't trace SQL requests. # (optional) If False doesn't trace SQL requests.
# Default: $::os_service_default # Default: $facts['os_service_default']
# #
class trove::conductor( class trove::conductor(
$enabled = true, $enabled = true,
$manage_service = true, $manage_service = true,
$package_ensure = 'present', $package_ensure = 'present',
$conductor_manager = 'trove.conductor.manager.Manager', $conductor_manager = 'trove.conductor.manager.Manager',
$workers = $::os_workers, $workers = $facts['os_workers'],
$enable_profiler = $::os_service_default, $enable_profiler = $facts['os_service_default'],
$trace_sqlalchemy = $::os_service_default, $trace_sqlalchemy = $facts['os_service_default'],
) { ) {
include trove::deps include trove::deps

18
manifests/db.pp
View File

@ -31,22 +31,22 @@
# #
# [*database_pool_timeout*] # [*database_pool_timeout*]
# (Optional) If set, use this value for pool_timeout with SQLAlchemy. # (Optional) If set, use this value for pool_timeout with SQLAlchemy.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*mysql_enable_ndb*] # [*mysql_enable_ndb*]
# (Optional) If True, transparently enables support for handling MySQL # (Optional) If True, transparently enables support for handling MySQL
# Cluster (NDB). # Cluster (NDB).
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
class trove::db ( class trove::db (
$database_connection = 'sqlite:////var/lib/trove/trove.sqlite', $database_connection = 'sqlite:////var/lib/trove/trove.sqlite',
$database_connection_recycle_time = $::os_service_default, $database_connection_recycle_time = $facts['os_service_default'],
$database_max_pool_size = $::os_service_default, $database_max_pool_size = $facts['os_service_default'],
$database_max_retries = $::os_service_default, $database_max_retries = $facts['os_service_default'],
$database_retry_interval = $::os_service_default, $database_retry_interval = $facts['os_service_default'],
$database_max_overflow = $::os_service_default, $database_max_overflow = $facts['os_service_default'],
$database_pool_timeout = $::os_service_default, $database_pool_timeout = $facts['os_service_default'],
$mysql_enable_ndb = $::os_service_default, $mysql_enable_ndb = $facts['os_service_default'],
) { ) {
include trove::deps include trove::deps

44
manifests/guestagent.pp
View File

@ -22,17 +22,17 @@
# #
# [*log_file*] # [*log_file*]
# (optional) The path of file used for logging # (optional) The path of file used for logging
# If set to $::os_service_default, it will not log to any file. # If set to $facts['os_service_default'], it will not log to any file.
# Default: /var/log/trove/trove-guestagent.log # Default: /var/log/trove/trove-guestagent.log
# #
# [*log_dir*] # [*log_dir*]
# (optional) directory to which trove logs are sent. # (optional) directory to which trove logs are sent.
# If set to $::os_service_default, it will not log to any directory. # If set to $facts['os_service_default'], it will not log to any directory.
# Defaults to '/var/log/trove' # Defaults to '/var/log/trove'
# #
# [*use_syslog*] # [*use_syslog*]
# (optional) Use syslog for logging. # (optional) Use syslog for logging.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*log_facility*] # [*log_facility*]
# (optional) Syslog facility to receive log lines. # (optional) Syslog facility to receive log lines.
@ -41,11 +41,11 @@
# [*swift_url*] # [*swift_url*]
# (optional) Swift URL. If this is unset in the class, Trove will # (optional) Swift URL. If this is unset in the class, Trove will
# lookup the URL using the Keystone catalog. # lookup the URL using the Keystone catalog.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*swift_service_type*] # [*swift_service_type*]
# (optional) Service type to use when searching catalog # (optional) Service type to use when searching catalog
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*default_transport_url*] # [*default_transport_url*]
# (optional) A URL representing the messaging driver to use and its full # (optional) A URL representing the messaging driver to use and its full
@ -62,23 +62,23 @@
# #
# [*root_grant*] # [*root_grant*]
# (optional) Permissions to grant "root" user. # (optional) Permissions to grant "root" user.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*root_grant_option*] # [*root_grant_option*]
# (optional) Permissions to grant "root" user option. # (optional) Permissions to grant "root" user option.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*container_registry*] # [*container_registry*]
# (optional) URL to the registry. # (optional) URL to the registry.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*container_registry_username*] # [*container_registry_username*]
# (optional) The registry username. # (optional) The registry username.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*container_registry_password*] # [*container_registry_password*]
# (optional) The plaintext registry password. # (optional) The plaintext registry password.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
# #
@ -94,20 +94,20 @@ class trove::guestagent(
$enabled = false, $enabled = false,
$manage_service = true, $manage_service = true,
$package_ensure = 'present', $package_ensure = 'present',
$debug = $::os_service_default, $debug = $facts['os_service_default'],
$log_file = '/var/log/trove/trove-guestagent.log', $log_file = '/var/log/trove/trove-guestagent.log',
$log_dir = '/var/log/trove', $log_dir = '/var/log/trove',
$use_syslog = $::os_service_default, $use_syslog = $facts['os_service_default'],
$log_facility = $::os_service_default, $log_facility = $facts['os_service_default'],
$swift_url = $::os_service_default, $swift_url = $facts['os_service_default'],
$swift_service_type = $::os_service_default, $swift_service_type = $facts['os_service_default'],
$default_transport_url = $::trove::default_transport_url, $default_transport_url = $::trove::default_transport_url,
$rabbit_use_ssl = $::trove::rabbit_use_ssl, $rabbit_use_ssl = $::trove::rabbit_use_ssl,
$root_grant = $::os_service_default, $root_grant = $facts['os_service_default'],
$root_grant_option = $::os_service_default, $root_grant_option = $facts['os_service_default'],
$container_registry = $::os_service_default, $container_registry = $facts['os_service_default'],
$container_registry_username = $::os_service_default, $container_registry_username = $facts['os_service_default'],
$container_registry_password = $::os_service_default, $container_registry_password = $facts['os_service_default'],
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$default_password_length = undef, $default_password_length = undef,
$backup_aes_cbc_key = undef, $backup_aes_cbc_key = undef,
@ -127,8 +127,8 @@ class trove::guestagent(
'DEFAULT/swift_service_type': value => $swift_service_type; 'DEFAULT/swift_service_type': value => $swift_service_type;
'DEFAULT/root_grant': value => $root_grant; 'DEFAULT/root_grant': value => $root_grant;
'DEFAULT/root_grant_option': value => $root_grant_option; 'DEFAULT/root_grant_option': value => $root_grant_option;
'DEFAULT/default_password_length': value => pick($default_password_length, $::os_service_default); 'DEFAULT/default_password_length': value => pick($default_password_length, $facts['os_service_default']);
'DEFAULT/backup_aes_cbc_key': value => pick($backup_aes_cbc_key, $::os_service_default); 'DEFAULT/backup_aes_cbc_key': value => pick($backup_aes_cbc_key, $facts['os_service_default']);
} }
oslo::messaging::default { 'trove_guestagent_config': oslo::messaging::default { 'trove_guestagent_config':

52
manifests/guestagent/mariadb.pp
View File

@ -6,72 +6,72 @@
# #
# [*docker_image*] # [*docker_image*]
# (optional) Database docker image. # (optional) Database docker image.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*backup_docker_image*] # [*backup_docker_image*]
# (optional) The docker image used for backup and restore. # (optional) The docker image used for backup and restore.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*icmp*] # [*icmp*]
# (optional) Whether to permit ICMP. # (optional) Whether to permit ICMP.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*root_on_create*] # [*root_on_create*]
# (optional) Enable the automatic creation of the root user for the service # (optional) Enable the automatic creation of the root user for the service
# during instance-create. # during instance-create.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*usage_timeout*] # [*usage_timeout*]
# (optional) Maximum time (in seconds) to wait for a Guest to become active. # (optional) Maximum time (in seconds) to wait for a Guest to become active.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*volume_support*] # [*volume_support*]
# (optional) Whether to provision a Cinder volume for datadir # (optional) Whether to provision a Cinder volume for datadir
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*ignore_users*] # [*ignore_users*]
# (optional) Users to exclude when listing users. # (optional) Users to exclude when listing users.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*ignore_dbs*] # [*ignore_dbs*]
# (optional) Databases to exclude when listing databases. # (optional) Databases to exclude when listing databases.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*guest_log_exposed_logs*] # [*guest_log_exposed_logs*]
# (optional) List of Guest Logs to expose for publishing. # (optional) List of Guest Logs to expose for publishing.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*guest_log_long_query_time*] # [*guest_log_long_query_time*]
# (optional) The time in milliseconds that a statement must take in in order # (optional) The time in milliseconds that a statement must take in in order
# to be logged in the slow_query log. # to be logged in the slow_query log.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*cluster_support*] # [*cluster_support*]
# (optional) Enable clusters to be created and managed. # (optional) Enable clusters to be created and managed.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*min_cluster_member_count*] # [*min_cluster_member_count*]
# (optional) Minimum number of members in MariaDB cluster. # (optional) Minimum number of members in MariaDB cluster.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*default_password_length*] # [*default_password_length*]
# (optional) Character length of generated passwords. # (optional) Character length of generated passwords.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
class trove::guestagent::mariadb ( class trove::guestagent::mariadb (
$docker_image = $::os_service_default, $docker_image = $facts['os_service_default'],
$backup_docker_image = $::os_service_default, $backup_docker_image = $facts['os_service_default'],
$icmp = $::os_service_default, $icmp = $facts['os_service_default'],
$root_on_create = $::os_service_default, $root_on_create = $facts['os_service_default'],
$usage_timeout = $::os_service_default, $usage_timeout = $facts['os_service_default'],
$volume_support = $::os_service_default, $volume_support = $facts['os_service_default'],
$ignore_users = $::os_service_default, $ignore_users = $facts['os_service_default'],
$ignore_dbs = $::os_service_default, $ignore_dbs = $facts['os_service_default'],
$guest_log_exposed_logs = $::os_service_default, $guest_log_exposed_logs = $facts['os_service_default'],
$guest_log_long_query_time = $::os_service_default, $guest_log_long_query_time = $facts['os_service_default'],
$cluster_support = $::os_service_default, $cluster_support = $facts['os_service_default'],
$min_cluster_member_count = $::os_service_default, $min_cluster_member_count = $facts['os_service_default'],
$default_password_length = $::os_service_default, $default_password_length = $facts['os_service_default'],
) { ) {
include trove::deps include trove::deps

44
manifests/guestagent/mysql.pp
View File

@ -6,62 +6,62 @@
# #
# [*docker_image*] # [*docker_image*]
# (optional) Database docker image. # (optional) Database docker image.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*backup_docker_image*] # [*backup_docker_image*]
# (optional) The docker image used for backup and restore. # (optional) The docker image used for backup and restore.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*icmp*] # [*icmp*]
# (optional) Whether to permit ICMP. # (optional) Whether to permit ICMP.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*root_on_create*] # [*root_on_create*]
# (optional) Enable the automatic creation of the root user for the service # (optional) Enable the automatic creation of the root user for the service
# during instance-create. # during instance-create.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*usage_timeout*] # [*usage_timeout*]
# (optional) Maximum time (in seconds) to wait for a Guest to become active. # (optional) Maximum time (in seconds) to wait for a Guest to become active.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*volume_support*] # [*volume_support*]
# (optional) Whether to provision a Cinder volume for datadir # (optional) Whether to provision a Cinder volume for datadir
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*ignore_users*] # [*ignore_users*]
# (optional) Users to exclude when listing users. # (optional) Users to exclude when listing users.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*ignore_dbs*] # [*ignore_dbs*]
# (optional) Databases to exclude when listing databases. # (optional) Databases to exclude when listing databases.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*guest_log_exposed_logs*] # [*guest_log_exposed_logs*]
# (optional) List of Guest Logs to expose for publishing. # (optional) List of Guest Logs to expose for publishing.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*guest_log_long_query_time*] # [*guest_log_long_query_time*]
# (optional) The time in milliseconds that a statement must take in in order # (optional) The time in milliseconds that a statement must take in in order
# to be logged in the slow_query log. # to be logged in the slow_query log.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*default_password_length*] # [*default_password_length*]
# (optional) Character length of generated passwords. # (optional) Character length of generated passwords.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
class trove::guestagent::mysql ( class trove::guestagent::mysql (
$docker_image = $::os_service_default, $docker_image = $facts['os_service_default'],
$backup_docker_image = $::os_service_default, $backup_docker_image = $facts['os_service_default'],
$icmp = $::os_service_default, $icmp = $facts['os_service_default'],
$root_on_create = $::os_service_default, $root_on_create = $facts['os_service_default'],
$usage_timeout = $::os_service_default, $usage_timeout = $facts['os_service_default'],
$volume_support = $::os_service_default, $volume_support = $facts['os_service_default'],
$ignore_users = $::os_service_default, $ignore_users = $facts['os_service_default'],
$ignore_dbs = $::os_service_default, $ignore_dbs = $facts['os_service_default'],
$guest_log_exposed_logs = $::os_service_default, $guest_log_exposed_logs = $facts['os_service_default'],
$guest_log_long_query_time = $::os_service_default, $guest_log_long_query_time = $facts['os_service_default'],
$default_password_length = $::os_service_default, $default_password_length = $facts['os_service_default'],
) { ) {
include trove::deps include trove::deps

8
manifests/guestagent/service_credentials.pp
View File

@ -31,7 +31,7 @@
# #
# [*system_scope*] # [*system_scope*]
# (optional) Scope for system operations. # (optional) Scope for system operations.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
class trove::guestagent::service_credentials ( class trove::guestagent::service_credentials (
$password, $password,
@ -41,7 +41,7 @@ class trove::guestagent::service_credentials (
$project_name = 'services', $project_name = 'services',
$project_domain_name = 'Default', $project_domain_name = 'Default',
$user_domain_name = 'Default', $user_domain_name = 'Default',
$system_scope = $::os_service_default, $system_scope = $facts['os_service_default'],
) { ) {
include trove::deps include trove::deps
@ -50,8 +50,8 @@ class trove::guestagent::service_credentials (
$project_name_real = $project_name $project_name_real = $project_name
$project_domain_name_real = $project_domain_name $project_domain_name_real = $project_domain_name
} else { } else {
$project_name_real = $::os_service_default $project_name_real = $facts['os_service_default']
$project_domain_name_real = $::os_service_default $project_domain_name_real = $facts['os_service_default']
} }
trove_guestagent_config { trove_guestagent_config {

152
manifests/init.pp
View File

@ -25,53 +25,53 @@
# (optional) A URL representing the messaging driver to use and its full # (optional) A URL representing the messaging driver to use and its full
# configuration. Transport URLs take the form: # configuration. Transport URLs take the form:
# transport://user:pass@host1:port[,hostN:portN]/virtual_host # transport://user:pass@host1:port[,hostN:portN]/virtual_host
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*notification_transport_url*] # [*notification_transport_url*]
# (optional) A URL representing the messaging driver to use for # (optional) A URL representing the messaging driver to use for
# notifications and its full configuration. Transport URLs # notifications and its full configuration. Transport URLs
# take the form: # take the form:
# transport://user:pass@host1:port[,hostN:portN]/virtual_host # transport://user:pass@host1:port[,hostN:portN]/virtual_host
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*notification_driver*] # [*notification_driver*]
# (optional) Driver or drivers to handle sending notifications. # (optional) Driver or drivers to handle sending notifications.
# Value can be a string or a list. # Value can be a string or a list.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*notification_topics*] # [*notification_topics*]
# (optional) AMQP topic used for OpenStack notifications # (optional) AMQP topic used for OpenStack notifications
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*rabbit_use_ssl*] # [*rabbit_use_ssl*]
# (optional) Connect over SSL for RabbitMQ # (optional) Connect over SSL for RabbitMQ
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*rabbit_notification_topic*] # [*rabbit_notification_topic*]
# (optional) Notification topic. # (optional) Notification topic.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*kombu_ssl_ca_certs*] # [*kombu_ssl_ca_certs*]
# (optional) SSL certification authority file (valid only if SSL enabled). # (optional) SSL certification authority file (valid only if SSL enabled).
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*kombu_ssl_certfile*] # [*kombu_ssl_certfile*]
# (optional) SSL cert file (valid only if SSL enabled). # (optional) SSL cert file (valid only if SSL enabled).
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*kombu_ssl_keyfile*] # [*kombu_ssl_keyfile*]
# (optional) SSL key file (valid only if SSL enabled). # (optional) SSL key file (valid only if SSL enabled).
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*kombu_ssl_version*] # [*kombu_ssl_version*]
# (optional) SSL version to use (valid only if SSL enabled). # (optional) SSL version to use (valid only if SSL enabled).
# Valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be # Valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be
# available on some distributions. # available on some distributions.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*rabbit_ha_queues*] # [*rabbit_ha_queues*]
# (optional) Use HA queues in RabbitMQ (x-ha-policy: all). # (optional) Use HA queues in RabbitMQ (x-ha-policy: all).
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*rabbit_heartbeat_in_pthread*] # [*rabbit_heartbeat_in_pthread*]
# (Optional) EXPERIMENTAL: Run the health check heartbeat thread # (Optional) EXPERIMENTAL: Run the health check heartbeat thread
@ -81,82 +81,82 @@
# example if the parent process have monkey patched the # example if the parent process have monkey patched the
# stdlib by using eventlet/greenlet then the heartbeat # stdlib by using eventlet/greenlet then the heartbeat
# will be run through a green thread. # will be run through a green thread.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*kombu_reconnect_delay*] # [*kombu_reconnect_delay*]
# (optional) How long to wait before reconnecting in response to an AMQP # (optional) How long to wait before reconnecting in response to an AMQP
# consumer cancel notification. # consumer cancel notification.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*kombu_failover_strategy*] # [*kombu_failover_strategy*]
# (Optional) Determines how the next RabbitMQ node is chosen in case the one # (Optional) Determines how the next RabbitMQ node is chosen in case the one
# we are currently connected to becomes unavailable. Takes effect only if # we are currently connected to becomes unavailable. Takes effect only if
# more than one RabbitMQ node is provided in config. (string value) # more than one RabbitMQ node is provided in config. (string value)
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*amqp_durable_queues*] # [*amqp_durable_queues*]
# (optional) Define queues as "durable" to rabbitmq. # (optional) Define queues as "durable" to rabbitmq.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*amqp_server_request_prefix*] # [*amqp_server_request_prefix*]
# (Optional) Address prefix used when sending to a specific server # (Optional) Address prefix used when sending to a specific server
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*amqp_broadcast_prefix*] # [*amqp_broadcast_prefix*]
# (Optional) address prefix used when broadcasting to all servers # (Optional) address prefix used when broadcasting to all servers
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*amqp_group_request_prefix*] # [*amqp_group_request_prefix*]
# (Optional) address prefix when sending to any server in group # (Optional) address prefix when sending to any server in group
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*amqp_container_name*] # [*amqp_container_name*]
# (Optional) Name for the AMQP container # (Optional) Name for the AMQP container
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*amqp_idle_timeout*] # [*amqp_idle_timeout*]
# (Optional) Timeout for inactive connections # (Optional) Timeout for inactive connections
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*amqp_trace*] # [*amqp_trace*]
# (Optional) Debug: dump AMQP frames to stdout # (Optional) Debug: dump AMQP frames to stdout
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*amqp_ssl_ca_file*] # [*amqp_ssl_ca_file*]
# (Optional) CA certificate PEM file to verify server certificate # (Optional) CA certificate PEM file to verify server certificate
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*amqp_ssl_cert_file*] # [*amqp_ssl_cert_file*]
# (Optional) Identifying certificate PEM file to present to clients # (Optional) Identifying certificate PEM file to present to clients
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*amqp_ssl_key_file*] # [*amqp_ssl_key_file*]
# (Optional) Private key PEM file used to sign cert_file certificate # (Optional) Private key PEM file used to sign cert_file certificate
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*amqp_ssl_key_password*] # [*amqp_ssl_key_password*]
# (Optional) Password for decrypting ssl_key_file (if encrypted) # (Optional) Password for decrypting ssl_key_file (if encrypted)
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*amqp_sasl_mechanisms*] # [*amqp_sasl_mechanisms*]
# (Optional) Space separated list of acceptable SASL mechanisms # (Optional) Space separated list of acceptable SASL mechanisms
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*amqp_sasl_config_dir*] # [*amqp_sasl_config_dir*]
# (Optional) Path to directory that contains the SASL configuration # (Optional) Path to directory that contains the SASL configuration
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*amqp_sasl_config_name*] # [*amqp_sasl_config_name*]
# (Optional) Name of configuration file (without .conf suffix) # (Optional) Name of configuration file (without .conf suffix)
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*amqp_username*] # [*amqp_username*]
# (Optional) User name for message broker authentication # (Optional) User name for message broker authentication
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*amqp_password*] # [*amqp_password*]
# (Optional) Password for message broker authentication # (Optional) Password for message broker authentication
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*single_tenant_mode*] # [*single_tenant_mode*]
# (optional) If set to true, will configure Trove to work in single # (optional) If set to true, will configure Trove to work in single
@ -169,7 +169,7 @@
# #
# [*rpc_response_timeout*] # [*rpc_response_timeout*]
# (Optional) Seconds to wait for a response from a call. # (Optional) Seconds to wait for a response from a call.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*control_exchange*] # [*control_exchange*]
# (optional) Control exchange. # (optional) Control exchange.
@ -209,70 +209,70 @@
# #
# [*nova_compute_endpoint_type*] # [*nova_compute_endpoint_type*]
# (optional) Service endpoint type to use when searching catalog. # (optional) Service endpoint type to use when searching catalog.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*neutron_endpoint_type*] # [*neutron_endpoint_type*]
# (optional) Service endpoint type to use when searching catalog. # (optional) Service endpoint type to use when searching catalog.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*cinder_endpoint_type*] # [*cinder_endpoint_type*]
# (optional) Service endpoint type to use when searching catalog. # (optional) Service endpoint type to use when searching catalog.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*swift_endpoint_type*] # [*swift_endpoint_type*]
# (optional) Service endpoint type to use when searching catalog. # (optional) Service endpoint type to use when searching catalog.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*glance_endpoint_type*] # [*glance_endpoint_type*]
# (optional) Service endpoint type to use when searching catalog. # (optional) Service endpoint type to use when searching catalog.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*trove_endpoint_type*] # [*trove_endpoint_type*]
# (optional) Service endpoint type to use when searching catalog. # (optional) Service endpoint type to use when searching catalog.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*management_networks*] # [*management_networks*]
# (optional) The network that trove will attach by default. # (optional) The network that trove will attach by default.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*package_ensure*] # [*package_ensure*]
# (optional) The state of the package. # (optional) The state of the package.
# Defaults to 'present' # Defaults to 'present'
# #
class trove( class trove(
$default_transport_url = $::os_service_default, $default_transport_url = $facts['os_service_default'],
$notification_transport_url = $::os_service_default, $notification_transport_url = $facts['os_service_default'],
$notification_driver = $::os_service_default, $notification_driver = $facts['os_service_default'],
$notification_topics = $::os_service_default, $notification_topics = $facts['os_service_default'],
$rabbit_use_ssl = $::os_service_default, $rabbit_use_ssl = $facts['os_service_default'],
$rabbit_ha_queues = $::os_service_default, $rabbit_ha_queues = $facts['os_service_default'],
$rabbit_notification_topic = $::os_service_default, $rabbit_notification_topic = $facts['os_service_default'],
$rabbit_heartbeat_in_pthread = $::os_service_default, $rabbit_heartbeat_in_pthread = $facts['os_service_default'],
$kombu_ssl_ca_certs = $::os_service_default, $kombu_ssl_ca_certs = $facts['os_service_default'],
$kombu_ssl_certfile = $::os_service_default, $kombu_ssl_certfile = $facts['os_service_default'],
$kombu_ssl_keyfile = $::os_service_default, $kombu_ssl_keyfile = $facts['os_service_default'],
$kombu_ssl_version = $::os_service_default, $kombu_ssl_version = $facts['os_service_default'],
$kombu_reconnect_delay = $::os_service_default, $kombu_reconnect_delay = $facts['os_service_default'],
$kombu_failover_strategy = $::os_service_default, $kombu_failover_strategy = $facts['os_service_default'],
$amqp_durable_queues = $::os_service_default, $amqp_durable_queues = $facts['os_service_default'],
$amqp_server_request_prefix = $::os_service_default, $amqp_server_request_prefix = $facts['os_service_default'],
$amqp_broadcast_prefix = $::os_service_default, $amqp_broadcast_prefix = $facts['os_service_default'],
$amqp_group_request_prefix = $::os_service_default, $amqp_group_request_prefix = $facts['os_service_default'],
$amqp_container_name = $::os_service_default, $amqp_container_name = $facts['os_service_default'],
$amqp_idle_timeout = $::os_service_default, $amqp_idle_timeout = $facts['os_service_default'],
$amqp_trace = $::os_service_default, $amqp_trace = $facts['os_service_default'],
$amqp_ssl_ca_file = $::os_service_default, $amqp_ssl_ca_file = $facts['os_service_default'],
$amqp_ssl_cert_file = $::os_service_default, $amqp_ssl_cert_file = $facts['os_service_default'],
$amqp_ssl_key_file = $::os_service_default, $amqp_ssl_key_file = $facts['os_service_default'],
$amqp_ssl_key_password = $::os_service_default, $amqp_ssl_key_password = $facts['os_service_default'],
$amqp_sasl_mechanisms = $::os_service_default, $amqp_sasl_mechanisms = $facts['os_service_default'],
$amqp_sasl_config_dir = $::os_service_default, $amqp_sasl_config_dir = $facts['os_service_default'],
$amqp_sasl_config_name = $::os_service_default, $amqp_sasl_config_name = $facts['os_service_default'],
$amqp_username = $::os_service_default, $amqp_username = $facts['os_service_default'],
$amqp_password = $::os_service_default, $amqp_password = $facts['os_service_default'],
$single_tenant_mode = false, $single_tenant_mode = false,
$nova_compute_url = false, $nova_compute_url = false,
$rpc_response_timeout = $::os_service_default, $rpc_response_timeout = $facts['os_service_default'],
$control_exchange = 'trove', $control_exchange = 'trove',
$cinder_url = false, $cinder_url = false,
$swift_url = false, $swift_url = false,
@ -282,13 +282,13 @@ class trove(
$swift_service_type = 'object-store', $swift_service_type = 'object-store',
$neutron_service_type = 'network', $neutron_service_type = 'network',
$glance_service_type = 'image', $glance_service_type = 'image',
$nova_compute_endpoint_type = $::os_service_default, $nova_compute_endpoint_type = $facts['os_service_default'],
$cinder_endpoint_type = $::os_service_default, $cinder_endpoint_type = $facts['os_service_default'],
$swift_endpoint_type = $::os_service_default, $swift_endpoint_type = $facts['os_service_default'],
$glance_endpoint_type = $::os_service_default, $glance_endpoint_type = $facts['os_service_default'],
$trove_endpoint_type = $::os_service_default, $trove_endpoint_type = $facts['os_service_default'],
$neutron_endpoint_type = $::os_service_default, $neutron_endpoint_type = $facts['os_service_default'],
$management_networks = $::os_service_default, $management_networks = $facts['os_service_default'],
$package_ensure = 'present', $package_ensure = 'present',
) { ) {

116
manifests/keystone/authtoken.pp
View File

@ -10,7 +10,7 @@
# #
# [*password*] # [*password*]
# (Optional) Password to create for the service user # (Optional) Password to create for the service user
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*auth_url*] # [*auth_url*]
# (Optional) The URL to use for authentication. # (Optional) The URL to use for authentication.
@ -30,17 +30,17 @@
# #
# [*system_scope*] # [*system_scope*]
# (Optional) Scope for system operations # (Optional) Scope for system operations
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*insecure*] # [*insecure*]
# (Optional) If true, explicitly allow TLS without checking server cert # (Optional) If true, explicitly allow TLS without checking server cert
# against any certificate authorities. WARNING: not recommended. Use with # against any certificate authorities. WARNING: not recommended. Use with
# caution. # caution.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*auth_section*] # [*auth_section*]
# (Optional) Config Section from which to load plugin specific options # (Optional) Config Section from which to load plugin specific options
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*auth_type*] # [*auth_type*]
# (Optional) Authentication type to load # (Optional) Authentication type to load
@ -52,26 +52,26 @@
# #
# [*auth_version*] # [*auth_version*]
# (Optional) API version of the admin Identity API endpoint. # (Optional) API version of the admin Identity API endpoint.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*cache*] # [*cache*]
# (Optional) Env key for the swift cache. # (Optional) Env key for the swift cache.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*cafile*] # [*cafile*]
# (Optional) A PEM encoded Certificate Authority to use when verifying HTTPs # (Optional) A PEM encoded Certificate Authority to use when verifying HTTPs
# connections. # connections.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*certfile*] # [*certfile*]
# (Optional) Required if identity server requires client certificate # (Optional) Required if identity server requires client certificate
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*delay_auth_decision*] # [*delay_auth_decision*]
# (Optional) Do not handle authorization requests within the middleware, but # (Optional) Do not handle authorization requests within the middleware, but
# delegate the authorization decision to downstream WSGI components. Boolean # delegate the authorization decision to downstream WSGI components. Boolean
# value # value
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*enforce_token_bind*] # [*enforce_token_bind*]
# (Optional) Used to control the use and type of token binding. Can be set # (Optional) Used to control the use and type of token binding. Can be set
@ -81,60 +81,60 @@
# type is unknown the token will be rejected. "required" any form of token # type is unknown the token will be rejected. "required" any form of token
# binding is needed to be allowed. Finally the name of a binding method that # binding is needed to be allowed. Finally the name of a binding method that
# must be present in tokens. String value. # must be present in tokens. String value.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*http_connect_timeout*] # [*http_connect_timeout*]
# (Optional) Request timeout value for communicating with Identity API # (Optional) Request timeout value for communicating with Identity API
# server. # server.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*http_request_max_retries*] # [*http_request_max_retries*]
# (Optional) How many times are we trying to reconnect when communicating # (Optional) How many times are we trying to reconnect when communicating
# with Identity API Server. Integer value # with Identity API Server. Integer value
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*include_service_catalog*] # [*include_service_catalog*]
# (Optional) Indicate whether to set the X-Service-Catalog header. If False, # (Optional) Indicate whether to set the X-Service-Catalog header. If False,
# middleware will not ask for service catalog on token validation and will # middleware will not ask for service catalog on token validation and will
# not # not
# set the X-Service-Catalog header. Boolean value. # set the X-Service-Catalog header. Boolean value.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*keyfile*] # [*keyfile*]
# (Optional) Required if identity server requires client certificate # (Optional) Required if identity server requires client certificate
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*memcache_pool_conn_get_timeout*] # [*memcache_pool_conn_get_timeout*]
# (Optional) Number of seconds that an operation will wait to get a memcached # (Optional) Number of seconds that an operation will wait to get a memcached
# client connection from the pool. Integer value # client connection from the pool. Integer value
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*memcache_pool_dead_retry*] # [*memcache_pool_dead_retry*]
# (Optional) Number of seconds memcached server is considered dead before it # (Optional) Number of seconds memcached server is considered dead before it
# is tried again. Integer value # is tried again. Integer value
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*memcache_pool_maxsize*] # [*memcache_pool_maxsize*]
# (Optional) Maximum total number of open connections to every memcached # (Optional) Maximum total number of open connections to every memcached
# server. Integer value # server. Integer value
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*memcache_pool_socket_timeout*] # [*memcache_pool_socket_timeout*]
# (Optional) Number of seconds a connection to memcached is held unused in # (Optional) Number of seconds a connection to memcached is held unused in
# the # the
# pool before it is closed. Integer value # pool before it is closed. Integer value
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*memcache_pool_unused_timeout*] # [*memcache_pool_unused_timeout*]
# (Optional) Number of seconds a connection to memcached is held unused in # (Optional) Number of seconds a connection to memcached is held unused in
# the # the
# pool before it is closed. Integer value # pool before it is closed. Integer value
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*memcache_secret_key*] # [*memcache_secret_key*]
# (Optional, mandatory if memcache_security_strategy is defined) This string # (Optional, mandatory if memcache_security_strategy is defined) This string
# is used for key derivation. # is used for key derivation.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*memcache_security_strategy*] # [*memcache_security_strategy*]
# (Optional) If defined, indicate whether token data should be authenticated # (Optional) If defined, indicate whether token data should be authenticated
@ -144,17 +144,17 @@
# in the cache. If ENCRYPT, token data is encrypted and authenticated in the # in the cache. If ENCRYPT, token data is encrypted and authenticated in the
# cache. If the value is not one of these options or empty, auth_token will # cache. If the value is not one of these options or empty, auth_token will
# raise an exception on initialization. # raise an exception on initialization.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*memcache_use_advanced_pool*] # [*memcache_use_advanced_pool*]
# (Optional) Use the advanced (eventlet safe) memcached client pool. The # (Optional) Use the advanced (eventlet safe) memcached client pool. The
# advanced pool will only work under python 2.x Boolean value # advanced pool will only work under python 2.x Boolean value
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*memcached_servers*] # [*memcached_servers*]
# (Optional) Optionally specify a list of memcached server(s) to use for # (Optional) Optionally specify a list of memcached server(s) to use for
# caching. If left undefined, tokens will instead be cached in-process. # caching. If left undefined, tokens will instead be cached in-process.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*manage_memcache_package*] # [*manage_memcache_package*]
# (Optional) Whether to install the python-memcache package. # (Optional) Whether to install the python-memcache package.
@ -162,13 +162,13 @@
# #
# [*region_name*] # [*region_name*]
# (Optional) The region in which the identity server can be found. # (Optional) The region in which the identity server can be found.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*token_cache_time*] # [*token_cache_time*]
# (Optional) In order to prevent excessive effort spent validating tokens, # (Optional) In order to prevent excessive effort spent validating tokens,
# the middleware caches previously-seen tokens for a configurable duration # the middleware caches previously-seen tokens for a configurable duration
# (in seconds). Set to -1 to disable caching completely. Integer value # (in seconds). Set to -1 to disable caching completely. Integer value
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*service_token_roles*] # [*service_token_roles*]
# (Optional) A choice of roles that must be present in a service token. # (Optional) A choice of roles that must be present in a service token.
@ -178,62 +178,62 @@
# here are applied as an ANY check so any role in this list # here are applied as an ANY check so any role in this list
# must be present. For backwards compatibility reasons this # must be present. For backwards compatibility reasons this
# currently only affects the allow_expired check. (list value) # currently only affects the allow_expired check. (list value)
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*service_token_roles_required*] # [*service_token_roles_required*]
# (optional) backwards compatibility to ensure that the service tokens are # (optional) backwards compatibility to ensure that the service tokens are
# compared against a list of possible roles for validity # compared against a list of possible roles for validity
# true/false # true/false
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*service_type*] # [*service_type*]
# (Optional) The name or type of the service as it appears in the service # (Optional) The name or type of the service as it appears in the service
# catalog. This is used to validate tokens that have restricted access rules. # catalog. This is used to validate tokens that have restricted access rules.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*interface*] # [*interface*]
# (Optional) Interface to use for the Identity API endpoint. Valid values are # (Optional) Interface to use for the Identity API endpoint. Valid values are
# "public", "internal" or "admin". # "public", "internal" or "admin".
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
class trove::keystone::authtoken( class trove::keystone::authtoken(
$username = 'trove', $username = 'trove',
$password = $::os_service_default, $password = $facts['os_service_default'],
$auth_url = 'http://localhost:5000', $auth_url = 'http://localhost:5000',
$project_name = 'services', $project_name = 'services',
$user_domain_name = 'Default', $user_domain_name = 'Default',
$project_domain_name = 'Default', $project_domain_name = 'Default',
$system_scope = $::os_service_default, $system_scope = $facts['os_service_default'],
$insecure = $::os_service_default, $insecure = $facts['os_service_default'],
$auth_section = $::os_service_default, $auth_section = $facts['os_service_default'],
$auth_type = 'password', $auth_type = 'password',
$www_authenticate_uri = 'http://localhost:5000', $www_authenticate_uri = 'http://localhost:5000',
$auth_version = $::os_service_default, $auth_version = $facts['os_service_default'],
$cache = $::os_service_default, $cache = $facts['os_service_default'],
$cafile = $::os_service_default, $cafile = $facts['os_service_default'],
$certfile = $::os_service_default, $certfile = $facts['os_service_default'],
$delay_auth_decision = $::os_service_default, $delay_auth_decision = $facts['os_service_default'],
$enforce_token_bind = $::os_service_default, $enforce_token_bind = $facts['os_service_default'],
$http_connect_timeout = $::os_service_default, $http_connect_timeout = $facts['os_service_default'],
$http_request_max_retries = $::os_service_default, $http_request_max_retries = $facts['os_service_default'],
$include_service_catalog = $::os_service_default, $include_service_catalog = $facts['os_service_default'],
$keyfile = $::os_service_default, $keyfile = $facts['os_service_default'],
$memcache_pool_conn_get_timeout = $::os_service_default, $memcache_pool_conn_get_timeout = $facts['os_service_default'],
$memcache_pool_dead_retry = $::os_service_default, $memcache_pool_dead_retry = $facts['os_service_default'],
$memcache_pool_maxsize = $::os_service_default, $memcache_pool_maxsize = $facts['os_service_default'],
$memcache_pool_socket_timeout = $::os_service_default, $memcache_pool_socket_timeout = $facts['os_service_default'],
$memcache_pool_unused_timeout = $::os_service_default, $memcache_pool_unused_timeout = $facts['os_service_default'],
$memcache_secret_key = $::os_service_default, $memcache_secret_key = $facts['os_service_default'],
$memcache_security_strategy = $::os_service_default, $memcache_security_strategy = $facts['os_service_default'],
$memcache_use_advanced_pool = $::os_service_default, $memcache_use_advanced_pool = $facts['os_service_default'],
$memcached_servers = $::os_service_default, $memcached_servers = $facts['os_service_default'],
$manage_memcache_package = false, $manage_memcache_package = false,
$region_name = $::os_service_default, $region_name = $facts['os_service_default'],
$token_cache_time = $::os_service_default, $token_cache_time = $facts['os_service_default'],
$service_token_roles = $::os_service_default, $service_token_roles = $facts['os_service_default'],
$service_token_roles_required = $::os_service_default, $service_token_roles_required = $facts['os_service_default'],
$service_type = $::os_service_default, $service_type = $facts['os_service_default'],
$interface = $::os_service_default, $interface = $facts['os_service_default'],
) { ) {
include trove::deps include trove::deps

80
manifests/logging.pp
View File

@ -6,72 +6,72 @@
# #
# [*debug*] # [*debug*]
# (Optional) Should the daemons log debug messages # (Optional) Should the daemons log debug messages
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*use_syslog*] # [*use_syslog*]
# (Optional) Use syslog for logging. # (Optional) Use syslog for logging.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*use_json*] # [*use_json*]
# (Optional) Use json for logging. # (Optional) Use json for logging.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*use_journal*] # [*use_journal*]
# (Optional) Use journal for logging. # (Optional) Use journal for logging.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*use_stderr*] # [*use_stderr*]
# (Optional) Use stderr for logging # (Optional) Use stderr for logging
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*log_facility*] # [*log_facility*]
# (Optional) Syslog facility to receive log lines. # (Optional) Syslog facility to receive log lines.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*log_dir*] # [*log_dir*]
# (Optional) Directory where logs should be stored. # (Optional) Directory where logs should be stored.
# If set to $::os_service_default, it will not log to any directory. # If set to $facts['os_service_default'], it will not log to any directory.
# Defaults to '/var/log/trove' # Defaults to '/var/log/trove'
# #
# [*log_file*] # [*log_file*]
# (Optional) The path of file used for logging # (Optional) The path of file used for logging
# If set to $::os_service_default, it will not log to any file. # If set to $facts['os_service_default'], it will not log to any file.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*watch_log_file*] # [*watch_log_file*]
# (Optional) Uses logging handler designed to watch file system (boolean value). # (Optional) Uses logging handler designed to watch file system (boolean value).
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*logging_context_format_string*] # [*logging_context_format_string*]
# (Optional) Format string to use for log messages with context. # (Optional) Format string to use for log messages with context.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# Example: '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s\ # Example: '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s\
# [%(request_id)s %(user_identity)s] %(instance)s%(message)s' # [%(request_id)s %(user_identity)s] %(instance)s%(message)s'
# #
# [*logging_default_format_string*] # [*logging_default_format_string*]
# (Optional) Format string to use for log messages without context. # (Optional) Format string to use for log messages without context.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# Example: '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s\ # Example: '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s\
# [-] %(instance)s%(message)s' # [-] %(instance)s%(message)s'
# #
# [*logging_debug_format_suffix*] # [*logging_debug_format_suffix*]
# (Optional) Formatted data to append to log format when level is DEBUG. # (Optional) Formatted data to append to log format when level is DEBUG.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# Example: '%(funcName)s %(pathname)s:%(lineno)d' # Example: '%(funcName)s %(pathname)s:%(lineno)d'
# #
# [*logging_exception_prefix*] # [*logging_exception_prefix*]
# (Optional) Prefix each line of exception output with this format. # (Optional) Prefix each line of exception output with this format.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# Example: '%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s' # Example: '%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s'
# #
# [*log_config_append*] # [*log_config_append*]
# (Optional) The name of an additional logging configuration file. # (Optional) The name of an additional logging configuration file.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# See https://docs.python.org/2/howto/logging.html # See https://docs.python.org/2/howto/logging.html
# #
# [*default_log_levels*] # [*default_log_levels*]
# (0ptional) Hash of logger (keys) and level (values) pairs. # (0ptional) Hash of logger (keys) and level (values) pairs.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# Example: # Example:
# { 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN', # { 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN',
# 'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN', # 'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN',
@ -79,50 +79,50 @@
# #
# [*publish_errors*] # [*publish_errors*]
# (Optional) Publish error events (boolean value). # (Optional) Publish error events (boolean value).
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*fatal_deprecations*] # [*fatal_deprecations*]
# (Optional) Make deprecations fatal (boolean value) # (Optional) Make deprecations fatal (boolean value)
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*instance_format*] # [*instance_format*]
# (Optional) If an instance is passed with the log message, format it # (Optional) If an instance is passed with the log message, format it
# like this (string value). # like this (string value).
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# Example: '[instance: %(uuid)s] ' # Example: '[instance: %(uuid)s] '
# #
# [*instance_uuid_format*] # [*instance_uuid_format*]
# (Optional) If an instance UUID is passed with the log message, format # (Optional) If an instance UUID is passed with the log message, format
# it like this (string value). # it like this (string value).
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# Example: instance_uuid_format='[instance: %(uuid)s] ' # Example: instance_uuid_format='[instance: %(uuid)s] '
# #
# [*log_date_format*] # [*log_date_format*]
# (Optional) Format string for %%(asctime)s in log records. # (Optional) Format string for %%(asctime)s in log records.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# Example: 'Y-%m-%d %H:%M:%S' # Example: 'Y-%m-%d %H:%M:%S'
# #
class trove::logging( class trove::logging(
$use_syslog = $::os_service_default, $use_syslog = $facts['os_service_default'],
$use_json = $::os_service_default, $use_json = $facts['os_service_default'],
$use_journal = $::os_service_default, $use_journal = $facts['os_service_default'],
$use_stderr = $::os_service_default, $use_stderr = $facts['os_service_default'],
$log_facility = $::os_service_default, $log_facility = $facts['os_service_default'],
$log_dir = '/var/log/trove', $log_dir = '/var/log/trove',
$log_file = $::os_service_default, $log_file = $facts['os_service_default'],
$watch_log_file = $::os_service_default, $watch_log_file = $facts['os_service_default'],
$debug = $::os_service_default, $debug = $facts['os_service_default'],
$logging_context_format_string = $::os_service_default, $logging_context_format_string = $facts['os_service_default'],
$logging_default_format_string = $::os_service_default, $logging_default_format_string = $facts['os_service_default'],
$logging_debug_format_suffix = $::os_service_default, $logging_debug_format_suffix = $facts['os_service_default'],
$logging_exception_prefix = $::os_service_default, $logging_exception_prefix = $facts['os_service_default'],
$log_config_append = $::os_service_default, $log_config_append = $facts['os_service_default'],
$default_log_levels = $::os_service_default, $default_log_levels = $facts['os_service_default'],
$publish_errors = $::os_service_default, $publish_errors = $facts['os_service_default'],
$fatal_deprecations = $::os_service_default, $fatal_deprecations = $facts['os_service_default'],
$instance_format = $::os_service_default, $instance_format = $facts['os_service_default'],
$instance_uuid_format = $::os_service_default, $instance_uuid_format = $facts['os_service_default'],
$log_date_format = $::os_service_default, $log_date_format = $facts['os_service_default'],
) { ) {
include trove::deps include trove::deps

11
manifests/params.pp
View File

@ -9,7 +9,7 @@ class trove::params {
$user = 'trove' $user = 'trove'
$group = 'trove' $group = 'trove'
case $::osfamily { case $facts['os']['family'] {
'RedHat': { 'RedHat': {
$common_package_name = 'openstack-trove' $common_package_name = 'openstack-trove'
$conductor_package_name = 'openstack-trove-conductor' $conductor_package_name = 'openstack-trove-conductor'
@ -21,7 +21,7 @@ class trove::params {
$taskmanager_package_name = 'openstack-trove-taskmanager' $taskmanager_package_name = 'openstack-trove-taskmanager'
$taskmanager_service_name = 'openstack-trove-taskmanager' $taskmanager_service_name = 'openstack-trove-taskmanager'
$trove_wsgi_script_dir = '/var/www/cgi-bin/trove' $trove_wsgi_script_dir = '/var/www/cgi-bin/trove'
$trove_wsgi_script_source = '/usr/bin/trove-api' $trove_wsgi_script_source = '/usr/bin/trove-wsgi'
} }
'Debian': { 'Debian': {
$common_package_name = 'trove-common' $common_package_name = 'trove-common'
@ -34,12 +34,11 @@ class trove::params {
$taskmanager_package_name = 'trove-taskmanager' $taskmanager_package_name = 'trove-taskmanager'
$taskmanager_service_name = 'trove-taskmanager' $taskmanager_service_name = 'trove-taskmanager'
$trove_wsgi_script_dir = '/usr/lib/cgi-bin/trove' $trove_wsgi_script_dir = '/usr/lib/cgi-bin/trove'
$trove_wsgi_script_source = '/usr/bin/trove-api' $trove_wsgi_script_source = '/usr/bin/trove-wsgi'
} }
default: { default: {
fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, \ fail("Unsupported osfamily: ${facts['os']['family']}")
module ${module_name} only support osfamily RedHat and Debian")
} }
} # Case $::osfamily } # Case $facts['os']['family']
} }

16
manifests/policy.pp
View File

@ -6,12 +6,12 @@
# #
# [*enforce_scope*] # [*enforce_scope*]
# (Optional) Whether or not to enforce scope when evaluating policies. # (Optional) Whether or not to enforce scope when evaluating policies.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*enforce_new_defaults*] # [*enforce_new_defaults*]
# (Optional) Whether or not to use old deprecated defaults when evaluating # (Optional) Whether or not to use old deprecated defaults when evaluating
# policies. # policies.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*policies*] # [*policies*]
# (Optional) Set of policies to configure for trove # (Optional) Set of policies to configure for trove
@ -34,11 +34,11 @@
# #
# [*policy_default_rule*] # [*policy_default_rule*]
# (Optional) Default rule. Enforced when a requested rule is not found. # (Optional) Default rule. Enforced when a requested rule is not found.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*policy_dirs*] # [*policy_dirs*]
# (Optional) Path to the trove policy folder # (Optional) Path to the trove policy folder
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*purge_config*] # [*purge_config*]
# (optional) Whether to set only the specified policy rules in the policy # (optional) Whether to set only the specified policy rules in the policy
@ -46,12 +46,12 @@
# Defaults to false. # Defaults to false.
# #
class trove::policy ( class trove::policy (
$enforce_scope = $::os_service_default, $enforce_scope = $facts['os_service_default'],
$enforce_new_defaults = $::os_service_default, $enforce_new_defaults = $facts['os_service_default'],
$policies = {}, $policies = {},
$policy_path = '/etc/trove/policy.yaml', $policy_path = '/etc/trove/policy.yaml',
$policy_default_rule = $::os_service_default, $policy_default_rule = $facts['os_service_default'],
$policy_dirs = $::os_service_default, $policy_dirs = $facts['os_service_default'],
$purge_config = false, $purge_config = false,
) { ) {

2
manifests/taskmanager.pp
View File

@ -35,7 +35,7 @@
# #
# [*guest_log_file*] # [*guest_log_file*]
# (optional) The path of file used for logging. # (optional) The path of file used for logging.
# If set to $::os_service_default, it will not log to any file. # If set to $facts['os_service_default'], it will not log to any file.
# Defaults to '/var/log/trove/trove-guestagent.log' # Defaults to '/var/log/trove/trove-guestagent.log'
# #
# [*guestagent_config_file*] # [*guestagent_config_file*]

8
manifests/wsgi/apache.pp
View File

@ -21,7 +21,7 @@
# #
# [*servername*] # [*servername*]
# (Optional) The servername for the virtualhost. # (Optional) The servername for the virtualhost.
# Defaults to $::fqdn # Defaults to $facts['networking']['fqdn']
# #
# [*port*] # [*port*]
# (Optional) The port. # (Optional) The port.
@ -41,7 +41,7 @@
# #
# [*workers*] # [*workers*]
# (Optional) Number of WSGI workers to spawn. # (Optional) Number of WSGI workers to spawn.
# Defaults to $::os_workers # Defaults to $facts['os_workers']
# #
# [*priority*] # [*priority*]
# (Optional) The priority for the vhost. # (Optional) The priority for the vhost.
@ -135,12 +135,12 @@
# class { 'trove::wsgi::apache': } # class { 'trove::wsgi::apache': }
# #
class trove::wsgi::apache ( class trove::wsgi::apache (
$servername = $::fqdn, $servername = $facts['networking']['fqdn'],
$port = 8779, $port = 8779,
$bind_host = undef, $bind_host = undef,
$path = '/', $path = '/',
$ssl = false, $ssl = false,
$workers = $::os_workers, $workers = $facts['os_workers'],
$ssl_cert = undef, $ssl_cert = undef,
$ssl_key = undef, $ssl_key = undef,
$ssl_chain = undef, $ssl_chain = undef,

2
spec/classes/trove_api_spec.rb
View File

@ -125,7 +125,7 @@ describe 'trove::api' do
end end
let(:platform_params) do let(:platform_params) do
case facts[:osfamily] case facts[:os]['family']
when 'Debian' when 'Debian'
{ :api_package_name => 'trove-api', { :api_package_name => 'trove-api',
:api_service_name => 'trove-api' } :api_service_name => 'trove-api' }

2
spec/classes/trove_client_spec.rb
View File

@ -55,7 +55,7 @@ describe 'trove::client' do
end end
let(:platform_params) do let(:platform_params) do
case facts[:osfamily] case facts[:os]['family']
when 'Debian' when 'Debian'
{ :client_package_name => 'python3-troveclient' } { :client_package_name => 'python3-troveclient' }
when 'RedHat' when 'RedHat'

2
spec/classes/trove_conductor_spec.rb
View File

@ -39,7 +39,7 @@ describe 'trove::conductor' do
end end
let(:platform_params) do let(:platform_params) do
case facts[:osfamily] case facts[:os]['family']
when 'Debian' when 'Debian'
{ :conductor_package_name => 'trove-conductor', { :conductor_package_name => 'trove-conductor',
:conductor_service_name => 'trove-conductor' } :conductor_service_name => 'trove-conductor' }

3
spec/classes/trove_db_sync_spec.rb
View File

@ -32,8 +32,7 @@ describe 'trove::db::sync' do
context "on #{os}" do context "on #{os}" do
let (:facts) do let (:facts) do
facts.merge(OSDefaults.get_facts({ facts.merge(OSDefaults.get_facts({
:os_workers => 8, :os_workers => 8,
:concat_basedir => '/var/lib/puppet/concat'
})) }))
end end

2
spec/classes/trove_guestagent_spec.rb
View File

@ -260,7 +260,7 @@ describe 'trove::guestagent' do
end end
let(:platform_params) do let(:platform_params) do
case facts[:osfamily] case facts[:os]['family']
when 'Debian' when 'Debian'
{ :guestagent_package_name => 'trove-guestagent', { :guestagent_package_name => 'trove-guestagent',
:guestagent_service_name => 'trove-guestagent' } :guestagent_service_name => 'trove-guestagent' }

2
spec/classes/trove_init_spec.rb
View File

@ -140,7 +140,7 @@ describe 'trove' do
end end
let(:platform_params) do let(:platform_params) do
case facts[:osfamily] case facts[:os]['family']
when 'Debian' when 'Debian'
{ :package_name => 'trove-common', } { :package_name => 'trove-common', }
when 'RedHat' when 'RedHat'

2
spec/classes/trove_taskmanager_spec.rb
View File

@ -69,7 +69,7 @@ describe 'trove::taskmanager' do
end end
let(:platform_params) do let(:platform_params) do
case facts[:osfamily] case facts[:os]['family']
when 'Debian' when 'Debian'
{ :taskmanager_package_name => 'trove-taskmanager', { :taskmanager_package_name => 'trove-taskmanager',
:taskmanager_service_name => 'trove-taskmanager' } :taskmanager_service_name => 'trove-taskmanager' }

12
spec/classes/trove_wsgi_apache_spec.rb
View File

@ -10,7 +10,7 @@ describe 'trove::wsgi::apache' do
:group => 'trove', :group => 'trove',
:path => '/', :path => '/',
:priority => 10, :priority => 10,
:servername => facts[:fqdn], :servername => 'foo.example.com',
:ssl => false, :ssl => false,
:threads => 1, :threads => 1,
:user => 'trove', :user => 'trove',
@ -149,23 +149,21 @@ describe 'trove::wsgi::apache' do
context "on #{os}" do context "on #{os}" do
let (:facts) do let (:facts) do
facts.merge!(OSDefaults.get_facts({ facts.merge!(OSDefaults.get_facts({
:os_workers => 8, :os_workers => 8,
:concat_basedir => '/var/lib/puppet/concat',
:fqdn => 'some.host.tld'
})) }))
end end
let(:platform_params) do let(:platform_params) do
case facts[:osfamily] case facts[:os]['family']
when 'Debian' when 'Debian'
{ {
:wsgi_script_path => '/usr/lib/cgi-bin/trove', :wsgi_script_path => '/usr/lib/cgi-bin/trove',
:wsgi_script_source => '/usr/bin/trove-api' :wsgi_script_source => '/usr/bin/trove-wsgi'
} }
when 'RedHat' when 'RedHat'
{ {
:wsgi_script_path => '/var/www/cgi-bin/trove', :wsgi_script_path => '/var/www/cgi-bin/trove',
:wsgi_script_source => '/usr/bin/trove-api' :wsgi_script_source => '/usr/bin/trove-wsgi'
} }
end end