diff --git a/manifests/api.pp b/manifests/api.pp index abdafe2f..57e60776 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -49,7 +49,7 @@ # # [*workers*] # (Optional) The number of workers to spawn. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*service_name*] # (optional) Name of the service that will be providing the @@ -62,16 +62,16 @@ # # [*public_endpoint*] # (Optional) Public URL to use when building the links to the API resources -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*enable_proxy_headers_parsing*] # (Optional) Enable paste middleware to handle SSL requests through # HTTPProxyToWSGI middleware. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*max_request_body_size*] # (Optional) Set max request body size -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # class ironic::api ( $package_ensure = 'present', @@ -81,10 +81,10 @@ class ironic::api ( $host_ip = '0.0.0.0', $port = '6385', $max_limit = '1000', - $workers = $::os_service_default, - $public_endpoint = $::os_service_default, - $enable_proxy_headers_parsing = $::os_service_default, - $max_request_body_size = $::os_service_default, + $workers = $facts['os_service_default'], + $public_endpoint = $facts['os_service_default'], + $enable_proxy_headers_parsing = $facts['os_service_default'], + $max_request_body_size = $facts['os_service_default'], ) inherits ironic::params { include ironic::deps diff --git a/manifests/api/authtoken.pp b/manifests/api/authtoken.pp index a9da56c1..f5de7d08 100644 --- a/manifests/api/authtoken.pp +++ b/manifests/api/authtoken.pp @@ -10,7 +10,7 @@ # # [*password*] # (Optional) Password to create for the service user -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*auth_url*] # (Optional) The URL to use for authentication. @@ -30,17 +30,17 @@ # # [*system_scope*] # (Optional) Scope for system operations -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*insecure*] # (Optional) If true, explicitly allow TLS without checking server cert # against any certificate authorities. WARNING: not recommended. Use with # caution. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*auth_section*] # (Optional) Config Section from which to load plugin specific options -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*auth_type*] # (Optional) Authentication type to load @@ -52,26 +52,26 @@ # # [*auth_version*] # (Optional) API version of the admin Identity API endpoint. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*cache*] # (Optional) Env key for the swift cache. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*cafile*] # (Optional) A PEM encoded Certificate Authority to use when verifying HTTPs # connections. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*certfile*] # (Optional) Required if identity server requires client certificate -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*delay_auth_decision*] # (Optional) Do not handle authorization requests within the middleware, but # delegate the authorization decision to downstream WSGI components. Boolean # value -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*enforce_token_bind*] # (Optional) Used to control the use and type of token binding. Can be set @@ -81,57 +81,57 @@ # 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 # must be present in tokens. String value. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*http_connect_timeout*] # (Optional) Request timeout value for communicating with Identity API # server. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*http_request_max_retries*] # (Optional) How many times are we trying to reconnect when communicating # with Identity API Server. Integer value -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*include_service_catalog*] # (Optional) Indicate whether to set the X-Service-Catalog header. If False, # middleware will not ask for service catalog on token validation and will # not set the X-Service-Catalog header. Boolean value. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*keyfile*] # (Optional) Required if identity server requires client certificate -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*memcache_pool_conn_get_timeout*] # (Optional) Number of seconds that an operation will wait to get a memcached # client connection from the pool. Integer value -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*memcache_pool_dead_retry*] # (Optional) Number of seconds memcached server is considered dead before it # is tried again. Integer value -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*memcache_pool_maxsize*] # (Optional) Maximum total number of open connections to every memcached # server. Integer value -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*memcache_pool_socket_timeout*] # (Optional) Number of seconds a connection to memcached is held unused in # the pool before it is closed. Integer value -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*memcache_pool_unused_timeout*] # (Optional) Number of seconds a connection to memcached is held unused in # the pool before it is closed. Integer value -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*memcache_secret_key*] # (Optional, mandatory if memcache_security_strategy is defined) This string # is used for key derivation. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*memcache_security_strategy*] # (Optional) If defined, indicate whether token data should be authenticated @@ -139,17 +139,17 @@ # HMAC) 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 # raise an exception on initialization. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*memcache_use_advanced_pool*] # (Optional) Use the advanced (eventlet safe) memcached client pool. The # advanced pool will only work under python 2.x Boolean value -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*memcached_servers*] # (Optional) Optionally specify a list of memcached server(s) to use for # 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*] # (Optional) Whether to install the python-memcache package. @@ -157,13 +157,13 @@ # # [*region_name*] # (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*] # (Optional) In order to prevent excessive effort spent validating tokens, # the middleware caches previously-seen tokens for a configurable duration # (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*] # (Optional) A choice of roles that must be present in a service token. @@ -173,24 +173,24 @@ # here are applied as an ANY check so any role in this list # must be present. For backwards compatibility reasons this # currently only affects the allow_expired check. (list value) -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*service_token_roles_required*] # (Optional) For backwards compatibility reasons we must let # valid service tokens pass that don't pass the service_token_roles # check as valid. Setting this true will become the default in # a future release and should be enabled if possible. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*service_type*] # (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. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*interface*] # (Optional) Interface to use for the Identity API endpoint. Valid values are # "public", "internal" or "admin". -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*params*] # (Optional) Hash of additional parameters to pass through to the keystone @@ -198,42 +198,42 @@ # class ironic::api::authtoken( $username = 'ironic', - $password = $::os_service_default, + $password = $facts['os_service_default'], $auth_url = 'http://127.0.0.1:5000', $project_name = 'services', $user_domain_name = 'Default', $project_domain_name = 'Default', - $system_scope = $::os_service_default, - $insecure = $::os_service_default, - $auth_section = $::os_service_default, + $system_scope = $facts['os_service_default'], + $insecure = $facts['os_service_default'], + $auth_section = $facts['os_service_default'], $auth_type = 'password', $www_authenticate_uri = 'http://127.0.0.1:5000', - $auth_version = $::os_service_default, - $cache = $::os_service_default, - $cafile = $::os_service_default, - $certfile = $::os_service_default, - $delay_auth_decision = $::os_service_default, - $enforce_token_bind = $::os_service_default, - $http_connect_timeout = $::os_service_default, - $http_request_max_retries = $::os_service_default, - $include_service_catalog = $::os_service_default, - $keyfile = $::os_service_default, - $memcache_pool_conn_get_timeout = $::os_service_default, - $memcache_pool_dead_retry = $::os_service_default, - $memcache_pool_maxsize = $::os_service_default, - $memcache_pool_socket_timeout = $::os_service_default, - $memcache_pool_unused_timeout = $::os_service_default, - $memcache_secret_key = $::os_service_default, - $memcache_security_strategy = $::os_service_default, - $memcache_use_advanced_pool = $::os_service_default, - $memcached_servers = $::os_service_default, + $auth_version = $facts['os_service_default'], + $cache = $facts['os_service_default'], + $cafile = $facts['os_service_default'], + $certfile = $facts['os_service_default'], + $delay_auth_decision = $facts['os_service_default'], + $enforce_token_bind = $facts['os_service_default'], + $http_connect_timeout = $facts['os_service_default'], + $http_request_max_retries = $facts['os_service_default'], + $include_service_catalog = $facts['os_service_default'], + $keyfile = $facts['os_service_default'], + $memcache_pool_conn_get_timeout = $facts['os_service_default'], + $memcache_pool_dead_retry = $facts['os_service_default'], + $memcache_pool_maxsize = $facts['os_service_default'], + $memcache_pool_socket_timeout = $facts['os_service_default'], + $memcache_pool_unused_timeout = $facts['os_service_default'], + $memcache_secret_key = $facts['os_service_default'], + $memcache_security_strategy = $facts['os_service_default'], + $memcache_use_advanced_pool = $facts['os_service_default'], + $memcached_servers = $facts['os_service_default'], $manage_memcache_package = false, - $region_name = $::os_service_default, - $token_cache_time = $::os_service_default, - $service_token_roles = $::os_service_default, - $service_token_roles_required = $::os_service_default, - $service_type = $::os_service_default, - $interface = $::os_service_default, + $region_name = $facts['os_service_default'], + $token_cache_time = $facts['os_service_default'], + $service_token_roles = $facts['os_service_default'], + $service_token_roles_required = $facts['os_service_default'], + $service_type = $facts['os_service_default'], + $interface = $facts['os_service_default'], $params = {}, ) { diff --git a/manifests/audit.pp b/manifests/audit.pp index ca3afba4..94944330 100644 --- a/manifests/audit.pp +++ b/manifests/audit.pp @@ -6,21 +6,21 @@ # # [*enabled*] # (Optional) Enable auditing of API requests -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*audit_map_file*] # (Optional) Path to audit map file for ironic-api service. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*ignore_req_list*] # (Optional) Comma separated list of Ironic REST API HTTP methods # to be ignored during audit logging. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class ironic::audit ( - $enabled = $::os_service_default, - $audit_map_file = $::os_service_default, - $ignore_req_list = $::os_service_default, + $enabled = $facts['os_service_default'], + $audit_map_file = $facts['os_service_default'], + $ignore_req_list = $facts['os_service_default'], ) { include ironic::deps diff --git a/manifests/cinder.pp b/manifests/cinder.pp index d5169416..6508e173 100644 --- a/manifests/cinder.pp +++ b/manifests/cinder.pp @@ -18,7 +18,7 @@ # # [*auth_url*] # The address of the keystone api endpoint. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*project_name*] # The Keystone project name. @@ -30,7 +30,7 @@ # # [*password*] # The admin password for ironic to connect to cinder. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*user_domain_name*] # The name of user's domain (required for Identity V3). @@ -42,28 +42,28 @@ # # [*system_scope*] # (Optional) Scope for system operations -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*region_name*] # (optional) Region name for connecting to cinder in admin context # through the OpenStack Identity service. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*endpoint_override*] # The endpoint URL for requests for this client -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class ironic::cinder ( $auth_type = 'password', - $auth_url = $::os_service_default, + $auth_url = $facts['os_service_default'], $project_name = 'services', $username = 'ironic', - $password = $::os_service_default, + $password = $facts['os_service_default'], $user_domain_name = 'Default', $project_domain_name = 'Default', - $system_scope = $::os_service_default, - $region_name = $::os_service_default, - $endpoint_override = $::os_service_default, + $system_scope = $facts['os_service_default'], + $region_name = $facts['os_service_default'], + $endpoint_override = $facts['os_service_default'], ) { include ironic::deps @@ -72,8 +72,8 @@ class ironic::cinder ( $project_name_real = $project_name $project_domain_name_real = $project_domain_name } else { - $project_name_real = $::os_service_default - $project_domain_name_real = $::os_service_default + $project_name_real = $facts['os_service_default'] + $project_domain_name_real = $facts['os_service_default'] } ironic_config { diff --git a/manifests/conductor.pp b/manifests/conductor.pp index 6140bb9b..cd58d398 100644 --- a/manifests/conductor.pp +++ b/manifests/conductor.pp @@ -33,7 +33,7 @@ # # [*enabled_hardware_types*] # (optional) Array of hardware types to load during service initialization. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*force_power_state_during_sync*] # (optional) Should the hardware power state be set to the state recorded in @@ -43,25 +43,25 @@ # # [*http_url*] # (optional) ironic-conductor node's HTTP server URL. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*http_root*] # (optional) ironic-conductor node's HTTP root path. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*force_raw_images*] # (optional) If true, convert backing images to "raw" disk image format. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*automated_clean*] # (optional) Whether to enable automated cleaning on nodes. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*cleaning_network*] # (optional) UUID or name of the network to create Neutron ports on, when # booting to a ramdisk for cleaning using Neutron DHCP. # Can not be specified together with cleaning_network_name. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*cleaning_disk_erase*] # (optional) Whether and how to erase hard drives during automated cleaning. @@ -74,142 +74,142 @@ # [*continue_if_disk_secure_erase_fails*] # (optional) Whether to continue with shredding the hard drive if secure ATA # erasure fails. Only makes sense if full hard disk erasing is enabled. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*provisioning_network*] # (optional) Neutron network UUID or name for the ramdisk to be booted into # for provisioning nodes. Required for neutron network interface. # Can not be specified together with provisioning_network_name. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*rescuing_network*] # (optional) Neutron network UUID or name for the ramdisk to be booted into # for rescue. Can not be specified together with rescuing_network_name. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*inspection_network*] # (optional) Neutron network UUID or name for the ramdisk to be booted into # for in-band inspection. Can not be specified together with # inspection_network_name. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*configdrive_use_object_store*] # (optional) Whether to use object store for storing config drives instead of # the database. Recommended for bigger config drives. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*configdrive_swift_container*] # (optional) Swift container to use for storing config drives if # configdrive_use_object_store is true. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*inspect_wait_timeout*] # (optional) Timeout (seconds) for waiting for node inspection. # 0 for unlimited. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_boot_option*] # (optional) Default boot option to use when no boot option is explicitly # requested. One of "netboot" or "local". -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_boot_mode*] # (optional) Default boot mode to use when no boot mode is explicitly # requested in node's driver_info, capabilities or in the "instance_info" # configuration.requested. One of "bios" or "uefi". -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*port_setup_delay*] # (optional) Delay value to wait for Neutron agents to setup # sufficient DHCP configuration for port. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*soft_power_off_timeout*] # (optional) Timeout (in seconds) of soft reboot and soft power off # operation. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*power_state_change_timeout*] # (optional) Timeout value to wait for a power operation to complete, # so that the baremetal node is in the desired new power state. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*sync_power_state_interval*] # (optional) Interval between syncing the node power state to the database, # in seconds. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*sync_power_state_workers*] # (optional) Number of worker threads syncing the node power state to the # database. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*power_state_sync_max_retries*] # (optional) The number of times Ironic should try syncing the hardware node # power state with the node power state in the database. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*power_failure_recovery_interval*] # (optional) Interval (in seconds) between checking the power # state for nodes previously put into maintenance mode due to power # synchronization failure. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*conductor_group*] # (optional) Name of the conductor group to join. This conductor will only # manage nodes with a matching "conductor_group" field set on the node. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*deploy_kernel*] # (optional) Glance UUID, http:// or file:// URL of the kernel of # the default deploy image. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*deploy_ramdisk*] # (optional) Glance UUID, http:// or file:// URL of the initramfs of # the default deploy image. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*rescue_kernel*] # (optional) Glance UUID, http:// or file:// URL of the kernel of # the default rescue image. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*rescue_ramdisk*] # (optional) Glance UUID, http:// or file:// URL of the initramfs of # the default rescue image. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*bootloader*] # (optional) Glance ID, http:// or file:// URL of the EFI system partition # image containing EFI boot loader. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*allow_provisioning_in_maintenance*] # (optional) Whether to allow nodes to enter or undergo deploy or cleaning # when in maintenance mode. If this option is set to False, and a node enters # maintenance during deploy or cleaning, the process will be aborted # after the next heartbeat. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*image_download_concurrency*] # (optional) How many image downloads and raw format conversion to run in # parallel. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*deploy_callback_timeout*] # (optional) Timeout (seconds) to wait for a callback from a deploy # ramdisk. Set to 0 to disable timeout. (integer value) -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*heartbeat_interval*] # (optional) Seconds between conductor heart beats. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*heartbeat_timeout*] # (optional) Maximum time (in seconds) since the last check-in of # a conductor. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # DEPRECATED PARAMETERS # @@ -241,41 +241,41 @@ class ironic::conductor ( $package_ensure = 'present', $enabled = true, $manage_service = true, - $enabled_hardware_types = $::os_service_default, + $enabled_hardware_types = $facts['os_service_default'], $force_power_state_during_sync = true, - $http_url = $::os_service_default, - $http_root = $::os_service_default, - $force_raw_images = $::os_service_default, - $automated_clean = $::os_service_default, - $cleaning_network = $::os_service_default, + $http_url = $facts['os_service_default'], + $http_root = $facts['os_service_default'], + $force_raw_images = $facts['os_service_default'], + $automated_clean = $facts['os_service_default'], + $cleaning_network = $facts['os_service_default'], $cleaning_disk_erase = undef, - $continue_if_disk_secure_erase_fails = $::os_service_default, - $provisioning_network = $::os_service_default, - $rescuing_network = $::os_service_default, - $inspection_network = $::os_service_default, - $configdrive_use_object_store = $::os_service_default, - $configdrive_swift_container = $::os_service_default, - $inspect_wait_timeout = $::os_service_default, - $default_boot_option = $::os_service_default, - $default_boot_mode = $::os_service_default, - $port_setup_delay = $::os_service_default, - $soft_power_off_timeout = $::os_service_default, - $power_state_change_timeout = $::os_service_default, - $sync_power_state_interval = $::os_service_default, - $sync_power_state_workers = $::os_service_default, - $power_state_sync_max_retries = $::os_service_default, - $power_failure_recovery_interval = $::os_service_default, - $conductor_group = $::os_service_default, - $deploy_kernel = $::os_service_default, - $deploy_ramdisk = $::os_service_default, - $rescue_kernel = $::os_service_default, - $rescue_ramdisk = $::os_service_default, - $bootloader = $::os_service_default, - $allow_provisioning_in_maintenance = $::os_service_default, - $image_download_concurrency = $::os_service_default, - $deploy_callback_timeout = $::os_service_default, - $heartbeat_interval = $::os_service_default, - $heartbeat_timeout = $::os_service_default, + $continue_if_disk_secure_erase_fails = $facts['os_service_default'], + $provisioning_network = $facts['os_service_default'], + $rescuing_network = $facts['os_service_default'], + $inspection_network = $facts['os_service_default'], + $configdrive_use_object_store = $facts['os_service_default'], + $configdrive_swift_container = $facts['os_service_default'], + $inspect_wait_timeout = $facts['os_service_default'], + $default_boot_option = $facts['os_service_default'], + $default_boot_mode = $facts['os_service_default'], + $port_setup_delay = $facts['os_service_default'], + $soft_power_off_timeout = $facts['os_service_default'], + $power_state_change_timeout = $facts['os_service_default'], + $sync_power_state_interval = $facts['os_service_default'], + $sync_power_state_workers = $facts['os_service_default'], + $power_state_sync_max_retries = $facts['os_service_default'], + $power_failure_recovery_interval = $facts['os_service_default'], + $conductor_group = $facts['os_service_default'], + $deploy_kernel = $facts['os_service_default'], + $deploy_ramdisk = $facts['os_service_default'], + $rescue_kernel = $facts['os_service_default'], + $rescue_ramdisk = $facts['os_service_default'], + $bootloader = $facts['os_service_default'], + $allow_provisioning_in_maintenance = $facts['os_service_default'], + $image_download_concurrency = $facts['os_service_default'], + $deploy_callback_timeout = $facts['os_service_default'], + $heartbeat_interval = $facts['os_service_default'], + $heartbeat_timeout = $facts['os_service_default'], # DEPRECATED PARAMETERS $cleaning_network_name = undef, $provisioning_network_name = undef, @@ -328,8 +328,8 @@ class ironic::conductor ( $erase_devices_metadata_priority = 0 } default: { - $erase_devices_priority = $::os_service_default - $erase_devices_metadata_priority = $::os_service_default + $erase_devices_priority = $facts['os_service_default'] + $erase_devices_metadata_priority = $facts['os_service_default'] } } diff --git a/manifests/cors.pp b/manifests/cors.pp index f331538c..a7270b1c 100644 --- a/manifests/cors.pp +++ b/manifests/cors.pp @@ -8,41 +8,41 @@ # (Optional) Indicate whether this resource may be shared with the domain # received in the requests "origin" header. # (string value) -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*allow_credentials*] # (Optional) Indicate that the actual request can include user credentials. # (boolean value) -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*expose_headers*] # (Optional) Indicate which headers are safe to expose to the API. # (list value) -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*max_age*] # (Optional) Maximum cache age of CORS preflight requests. # (integer value) -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*allow_methods*] # (Optional) Indicate which methods can be used during the actual request. # (list value) -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*allow_headers*] # (Optional) Indicate which header field names may be used during the actual # request. # (list value) -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # class ironic::cors ( - $allowed_origin = $::os_service_default, - $allow_credentials = $::os_service_default, - $expose_headers = $::os_service_default, - $max_age = $::os_service_default, - $allow_methods = $::os_service_default, - $allow_headers = $::os_service_default, + $allowed_origin = $facts['os_service_default'], + $allow_credentials = $facts['os_service_default'], + $expose_headers = $facts['os_service_default'], + $max_age = $facts['os_service_default'], + $allow_methods = $facts['os_service_default'], + $allow_headers = $facts['os_service_default'], ) { include ironic::deps diff --git a/manifests/db.pp b/manifests/db.pp index 3737cb76..b3912cf2 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -10,49 +10,49 @@ # # [*database_connection_recycle_time*] # Timeout when db connections should be reaped. -# (Optional) Defaults to $::os_service_default +# (Optional) Defaults to $facts['os_service_default'] # # [*database_max_retries*] # Maximum db connection retries during startup. # Setting -1 implies an infinite retry count. -# (Optional) Defaults to $::os_service_default +# (Optional) Defaults to $facts['os_service_default'] # # [*database_retry_interval*] # Interval between retries of opening a sql connection. -# (Optional) Defaults to $::os_service_default +# (Optional) Defaults to $facts['os_service_default'] # # [*database_max_pool_size*] # Maximum number of SQL connections to keep open in a pool. -# (Optional) Defaults to $::os_service_default +# (Optional) Defaults to $facts['os_service_default'] # # [*database_max_overflow*] # If set, use this value for max_overflow with sqlalchemy. -# (Optional) Defaults to $::os_service_default +# (Optional) Defaults to $facts['os_service_default'] # # [*database_db_max_retries*] # (Optional) Maximum retries in case of connection error or deadlock error # before error is raised. Set to -1 to specify an infinite retry count. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*database_pool_timeout*] # (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*] # (Optional) If True, transparently enables support for handling MySQL # Cluster (NDB). -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class ironic::db ( $database_connection = 'sqlite:////var/lib/ironic/ovs.sqlite', - $database_connection_recycle_time = $::os_service_default, - $database_max_retries = $::os_service_default, - $database_retry_interval = $::os_service_default, - $database_max_pool_size = $::os_service_default, - $database_max_overflow = $::os_service_default, - $database_db_max_retries = $::os_service_default, - $database_pool_timeout = $::os_service_default, - $mysql_enable_ndb = $::os_service_default, + $database_connection_recycle_time = $facts['os_service_default'], + $database_max_retries = $facts['os_service_default'], + $database_retry_interval = $facts['os_service_default'], + $database_max_pool_size = $facts['os_service_default'], + $database_max_overflow = $facts['os_service_default'], + $database_db_max_retries = $facts['os_service_default'], + $database_pool_timeout = $facts['os_service_default'], + $mysql_enable_ndb = $facts['os_service_default'], ) { include ironic::deps diff --git a/manifests/disk_utils.pp b/manifests/disk_utils.pp index 68dccf15..d2311a7f 100644 --- a/manifests/disk_utils.pp +++ b/manifests/disk_utils.pp @@ -7,42 +7,42 @@ # [*efi_system_partition_size*] # (optional) Size of EFI system partition in MiB when configuring UEFI systems # for local boot. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*bios_boot_partition_size*] # (optional) Size of BIOS Boot partition in MiB when configuring GPT # partitioned systems for local boot in BIOS. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*dd_block_size*] # (optional) Block size to use when writing to the node disk. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*partition_detection_attempts*] # (optional) Maximum attempts to detect a newly created partition. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*partprobe_attempts*] # (optional) Maximum number of attempts to try to read the partition. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*image_convert_memory_limit*] # (optional) Memory limit for "qemu-img convert" in MiB. Implemented via # the address space resource limit. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*image_convert_attempts*] # (optional) Number of attempts to convert an image -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class ironic::disk_utils ( - $efi_system_partition_size = $::os_service_default, - $bios_boot_partition_size = $::os_service_default, - $dd_block_size = $::os_service_default, - $partition_detection_attempts = $::os_service_default, - $partprobe_attempts = $::os_service_default, - $image_convert_memory_limit = $::os_service_default, - $image_convert_attempts = $::os_service_default, + $efi_system_partition_size = $facts['os_service_default'], + $bios_boot_partition_size = $facts['os_service_default'], + $dd_block_size = $facts['os_service_default'], + $partition_detection_attempts = $facts['os_service_default'], + $partprobe_attempts = $facts['os_service_default'], + $image_convert_memory_limit = $facts['os_service_default'], + $image_convert_attempts = $facts['os_service_default'], ) { include ironic::deps diff --git a/manifests/drivers/agent.pp b/manifests/drivers/agent.pp index 9be052a0..0f004060 100644 --- a/manifests/drivers/agent.pp +++ b/manifests/drivers/agent.pp @@ -17,81 +17,81 @@ # [*stream_raw_images*] # (optional) Whether to stream raw images directly on the hard drive instead # of first caching them in memory. Ignored when iSCSI is used for deploy. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*image_download_source*] # (optional) Specifies whether direct deploy interface should try to use # the image source directly or if ironic should cache the image on # the conductor and serve it from ironic's own http server. # Accepts values "swift" (the default) or "http". -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*post_deploy_get_power_state_retries*] # (optional) Number of retries getting power state after a soft power off. # Must be a valid integer. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*post_deploy_get_power_state_retry_interval*] # (optional) Amount of time (in seconds) to wait between polling power state # after the soft power off. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*deploy_logs_collect*] # (optional) Whether and when to collect IPA logs after deployment. # Accepts values "always", "on_failure", "never". -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*deploy_logs_storage_backend*] # (optional) The backend to store IPA logs, if enabled. # Accepts values "local" and "swift". -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*deploy_logs_local_path*] # (optional) The path to store IPA logs if deploy_logs_storage_backend is # "local" (ignored otherwise). -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*deploy_logs_swift_container*] # (optional) Swift container to store IPA logs if deploy_logs_storage_backend # is "swift" (ignored otherwise). -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*deploy_logs_swift_days_to_expire*] # (optional) Number of days before IPA logs expire in Swift. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*command_timeout*] # (optional) Timeout in seconds to wait for a response from the agent. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*max_command_attempts*] # (optional) Number of times to try connecting to the agent for a command. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*command_wait_attempts*] # (optional) Number of attempts to check for asynchronous commands completion # before timing out. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*command_wait_interval*] # (optional) Number of seconds to wait for between checks for asynchronous # commands completion. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class ironic::drivers::agent ( - $stream_raw_images = $::os_service_default, - $image_download_source = $::os_service_default, - $post_deploy_get_power_state_retries = $::os_service_default, - $post_deploy_get_power_state_retry_interval = $::os_service_default, - $deploy_logs_collect = $::os_service_default, - $deploy_logs_storage_backend = $::os_service_default, - $deploy_logs_local_path = $::os_service_default, - $deploy_logs_swift_container = $::os_service_default, - $deploy_logs_swift_days_to_expire = $::os_service_default, - $command_timeout = $::os_service_default, - $max_command_attempts = $::os_service_default, - $command_wait_attempts = $::os_service_default, - $command_wait_interval = $::os_service_default, + $stream_raw_images = $facts['os_service_default'], + $image_download_source = $facts['os_service_default'], + $post_deploy_get_power_state_retries = $facts['os_service_default'], + $post_deploy_get_power_state_retry_interval = $facts['os_service_default'], + $deploy_logs_collect = $facts['os_service_default'], + $deploy_logs_storage_backend = $facts['os_service_default'], + $deploy_logs_local_path = $facts['os_service_default'], + $deploy_logs_swift_container = $facts['os_service_default'], + $deploy_logs_swift_days_to_expire = $facts['os_service_default'], + $command_timeout = $facts['os_service_default'], + $max_command_attempts = $facts['os_service_default'], + $command_wait_attempts = $facts['os_service_default'], + $command_wait_interval = $facts['os_service_default'], ) { include ironic::deps diff --git a/manifests/drivers/ansible.pp b/manifests/drivers/ansible.pp index d370b833..a914ccee 100644 --- a/manifests/drivers/ansible.pp +++ b/manifests/drivers/ansible.pp @@ -20,65 +20,65 @@ # # [*ansible_extra_args*] # (optional) Extra arguments to pass on every invocation of ansible. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*playbooks_path*] # (optional) Path to directory with playbooks, roles and local inventory. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*config_file_path*] # (optional) Path to ansible configuration file. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*image_store_insecure*] # (optional) Skip verifying SSL connections to the image store when # downloading the image. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_username*] # (optional) Default name of the user to use for Ansible when connecting to # the ramdisk over SSH. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_key_file*] # (optional) Absolute path to the private SSH key file to use by Ansible # by default when connecting to the ramdisk over SSH. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_deploy_playbook*] # (optional) Path to the default playbook used for deployment. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_shutdown_playbook*] # (optional) Path to the default playbook used for graceful shutdown. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_clean_playbook*] # (optional) Path to the default playbook used for cleaning. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_clean_steps_config*] # (optional) Path to the default auxiliary cleaning steps file used during # cleaning. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_python_interpreter*] # (optional) Absolute path to the python interpreter on the managed machines. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] class ironic::drivers::ansible ( $package_ensure = 'present', - $ansible_extra_args = $::os_service_default, - $playbooks_path = $::os_service_default, - $config_file_path = $::os_service_default, - $image_store_insecure = $::os_service_default, - $default_username = $::os_service_default, - $default_key_file = $::os_service_default, - $default_deploy_playbook = $::os_service_default, - $default_shutdown_playbook = $::os_service_default, - $default_clean_playbook = $::os_service_default, - $default_clean_steps_config = $::os_service_default, - $default_python_interpreter = $::os_service_default, + $ansible_extra_args = $facts['os_service_default'], + $playbooks_path = $facts['os_service_default'], + $config_file_path = $facts['os_service_default'], + $image_store_insecure = $facts['os_service_default'], + $default_username = $facts['os_service_default'], + $default_key_file = $facts['os_service_default'], + $default_deploy_playbook = $facts['os_service_default'], + $default_shutdown_playbook = $facts['os_service_default'], + $default_clean_playbook = $facts['os_service_default'], + $default_clean_steps_config = $facts['os_service_default'], + $default_python_interpreter = $facts['os_service_default'], ) { include ironic::deps diff --git a/manifests/drivers/hardware_interface.pp b/manifests/drivers/hardware_interface.pp index 9d4b84e9..b6cec26d 100644 --- a/manifests/drivers/hardware_interface.pp +++ b/manifests/drivers/hardware_interface.pp @@ -23,16 +23,16 @@ # # [*enabled_list*] # List of enabled implementations. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default*] # The default implementation to use when none is requested by a user. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # define ironic::drivers::hardware_interface ( $interface_type = $title, - $enabled_list = $::os_service_default, - $default = $::os_service_default, + $enabled_list = $facts['os_service_default'], + $default = $facts['os_service_default'], ) { include ironic::deps @@ -41,7 +41,7 @@ define ironic::drivers::hardware_interface ( validate_legacy(Array, 'validate_array', $enabled_list) $enabled_list_real = join($enabled_list, ',') } else { - $enabled_list_real = $::os_service_default + $enabled_list_real = $facts['os_service_default'] } ironic_config { diff --git a/manifests/drivers/ilo.pp b/manifests/drivers/ilo.pp index 1afebcf6..ac934d3a 100644 --- a/manifests/drivers/ilo.pp +++ b/manifests/drivers/ilo.pp @@ -17,32 +17,32 @@ # [*client_timeout*] # (optional) Maximum time in seconds to wait for iLO commands. # Should be an integer value -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*client_port*] # (optional) Port to use for iLO operations. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*use_web_server_for_images*] # (optional) Whether to use the Web server (the same as used for iPXE) # to host virtual media images. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*default_boot_mode*] # (optional) The default boot mode to use when no boot mode is explicitly # requested. Accepts values "uefi", "bios" and "auto". The "auto" value will # use UEFI if it's available on the machine, BIOS otherwise. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*package_ensure*] # (optional) The state of the proliantutils package # Defaults to 'present' # class ironic::drivers::ilo ( - $client_timeout = $::os_service_default, - $client_port = $::os_service_default, - $use_web_server_for_images = $::os_service_default, - $default_boot_mode = $::os_service_default, + $client_timeout = $facts['os_service_default'], + $client_port = $facts['os_service_default'], + $use_web_server_for_images = $facts['os_service_default'], + $default_boot_mode = $facts['os_service_default'], $package_ensure = 'present', ) { diff --git a/manifests/drivers/inspector.pp b/manifests/drivers/inspector.pp index ea0e00cc..07199317 100644 --- a/manifests/drivers/inspector.pp +++ b/manifests/drivers/inspector.pp @@ -20,7 +20,7 @@ # # [*auth_url*] # The address of the keystone api endpoint. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*project_name*] # The Keystone project name. @@ -32,7 +32,7 @@ # # [*password*] # The admin password for ironic to connect to ironic-inspector. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*user_domain_name*] # The name of user's domain (required for Identity V3). @@ -44,43 +44,43 @@ # # [*system_scope*] # (Optional) Scope for system operations -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*region_name*] # (optional) Region name for connecting to ironic-inspector in admin context # through the OpenStack Identity service. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*endpoint_override*] # The endpoint URL for requests for this client -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*callback_endpoint_override*] # The endpoint URL to use for ramdisk callback in case of managed boot. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*power_off*] # Whether to power off a node after inspection in case of managed boot. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*extra_kernel_params*] # Extra kernel parameters to pass in case of managed boot. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class ironic::drivers::inspector ( $auth_type = 'password', - $auth_url = $::os_service_default, + $auth_url = $facts['os_service_default'], $project_name = 'services', $username = 'ironic', - $password = $::os_service_default, + $password = $facts['os_service_default'], $user_domain_name = 'Default', $project_domain_name = 'Default', - $system_scope = $::os_service_default, - $region_name = $::os_service_default, - $endpoint_override = $::os_service_default, - $callback_endpoint_override = $::os_service_default, - $power_off = $::os_service_default, - $extra_kernel_params = $::os_service_default, + $system_scope = $facts['os_service_default'], + $region_name = $facts['os_service_default'], + $endpoint_override = $facts['os_service_default'], + $callback_endpoint_override = $facts['os_service_default'], + $power_off = $facts['os_service_default'], + $extra_kernel_params = $facts['os_service_default'], ) { include ironic::deps @@ -89,8 +89,8 @@ class ironic::drivers::inspector ( $project_name_real = $project_name $project_domain_name_real = $project_domain_name } else { - $project_name_real = $::os_service_default - $project_domain_name_real = $::os_service_default + $project_name_real = $facts['os_service_default'] + $project_domain_name_real = $facts['os_service_default'] } ironic_config { diff --git a/manifests/drivers/interfaces.pp b/manifests/drivers/interfaces.pp index 7762caac..29f4206b 100644 --- a/manifests/drivers/interfaces.pp +++ b/manifests/drivers/interfaces.pp @@ -17,148 +17,148 @@ # [*default_bios_interface*] # (optional) Default bios interface to be used for nodes that do not have # bios_interface field set. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_boot_interface*] # (optional) Default boot interface to be used for nodes that do not have # boot_interface field set. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_console_interface*] # (optional) Default console interface to be used for nodes that do not have # console_interface field set. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_deploy_interface*] # (optional) Default deploy interface to be used for nodes that do not have # deploy_interface field set. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_inspect_interface*] # (optional) Default inspect interface to be used for nodes that do not have # inspect_interface field set. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_management_interface*] # (optional) Default management interface to be used for nodes that do not have # management_interface field set. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_network_interface*] # (optional) Default network interface to be used for nodes that do not have # network_interface field set. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_power_interface*] # (optional) Default power interface to be used for nodes that do not have # power_interface field set. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_raid_interface*] # (optional) Default raid interface to be used for nodes that do not have # raid_interface field set. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_rescue_interface*] # (optional) Default rescue interface to be used for nodes that do not have # rescue_interface field set. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_storage_interface*] # (optional) Default storage interface to be used for nodes that do not have # storage_interface field set. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_vendor_interface*] # (optional) Default vendor interface to be used for nodes that do not have # vendor_interface field set. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*enabled_bios_interfaces*] # (optional) Specify the list of bios interfaces to load during # service initialization. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*enabled_boot_interfaces*] # (optional) Specify the list of boot interfaces to load during # service initialization. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*enabled_console_interfaces*] # (optional) Specify the list of console interfaces to load during # service initialization. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*enabled_deploy_interfaces*] # (optional) Specify the list of deploy interfaces to load during # service initialization. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*enabled_inspect_interfaces*] # (optional) Specify the list of inspect interfaces to load during # service initialization. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*enabled_management_interfaces*] # (optional) Specify the list of management interfaces to load during # service initialization. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*enabled_network_interfaces*] # (optional) Specify the list of network interfaces to load during # service initialization. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*enabled_power_interfaces*] # (optional) Specify the list of power interfaces to load during # service initialization. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*enabled_raid_interfaces*] # (optional) Specify the list of raid interfaces to load during # service initialization. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*enabled_rescue_interfaces*] # (optional) Specify the list of rescue interfaces to load during # service initialization. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*enabled_storage_interfaces*] # (optional) Specify the list of storage interfaces to load during # service initialization. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*enabled_vendor_interfaces*] # (optional) Specify the list of vendor interfaces to load during # service initialization. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class ironic::drivers::interfaces ( - $default_bios_interface = $::os_service_default, - $default_boot_interface = $::os_service_default, - $default_console_interface = $::os_service_default, - $default_deploy_interface = $::os_service_default, - $default_inspect_interface = $::os_service_default, - $default_management_interface = $::os_service_default, - $default_network_interface = $::os_service_default, - $default_power_interface = $::os_service_default, - $default_raid_interface = $::os_service_default, - $default_rescue_interface = $::os_service_default, - $default_storage_interface = $::os_service_default, - $default_vendor_interface = $::os_service_default, - $enabled_bios_interfaces = $::os_service_default, - $enabled_boot_interfaces = $::os_service_default, - $enabled_console_interfaces = $::os_service_default, - $enabled_deploy_interfaces = $::os_service_default, - $enabled_inspect_interfaces = $::os_service_default, - $enabled_management_interfaces = $::os_service_default, - $enabled_network_interfaces = $::os_service_default, - $enabled_power_interfaces = $::os_service_default, - $enabled_raid_interfaces = $::os_service_default, - $enabled_rescue_interfaces = $::os_service_default, - $enabled_storage_interfaces = $::os_service_default, - $enabled_vendor_interfaces = $::os_service_default, + $default_bios_interface = $facts['os_service_default'], + $default_boot_interface = $facts['os_service_default'], + $default_console_interface = $facts['os_service_default'], + $default_deploy_interface = $facts['os_service_default'], + $default_inspect_interface = $facts['os_service_default'], + $default_management_interface = $facts['os_service_default'], + $default_network_interface = $facts['os_service_default'], + $default_power_interface = $facts['os_service_default'], + $default_raid_interface = $facts['os_service_default'], + $default_rescue_interface = $facts['os_service_default'], + $default_storage_interface = $facts['os_service_default'], + $default_vendor_interface = $facts['os_service_default'], + $enabled_bios_interfaces = $facts['os_service_default'], + $enabled_boot_interfaces = $facts['os_service_default'], + $enabled_console_interfaces = $facts['os_service_default'], + $enabled_deploy_interfaces = $facts['os_service_default'], + $enabled_inspect_interfaces = $facts['os_service_default'], + $enabled_management_interfaces = $facts['os_service_default'], + $enabled_network_interfaces = $facts['os_service_default'], + $enabled_power_interfaces = $facts['os_service_default'], + $enabled_raid_interfaces = $facts['os_service_default'], + $enabled_rescue_interfaces = $facts['os_service_default'], + $enabled_storage_interfaces = $facts['os_service_default'], + $enabled_vendor_interfaces = $facts['os_service_default'], ) { $interfaces = { diff --git a/manifests/drivers/ipmi.pp b/manifests/drivers/ipmi.pp index aeadf621..0f363800 100644 --- a/manifests/drivers/ipmi.pp +++ b/manifests/drivers/ipmi.pp @@ -22,37 +22,37 @@ # [*command_retry_timeout*] # (optional) Maximum time in seconds to retry IPMI operations. # Should be an integer value -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*min_command_interval*] # (optional) Minimum time, in seconds, between IPMI operations. # Should be an integer value -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*use_ipmitool_retries*] # (optional) Whether the retry feature in ipmitool is used. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*kill_on_timeout*] # (optional) Kill ipmitool process when the timeout expires. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*disable_boot_timeout*] # (optional) Whether ironic sends a raw IPMI command to disable the 60 second # timeout for booting. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*debug*] # (optional) Enables debug outputs of IPMI commands -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class ironic::drivers::ipmi ( - $command_retry_timeout = $::os_service_default, - $min_command_interval = $::os_service_default, - $use_ipmitool_retries = $::os_service_default, - $kill_on_timeout = $::os_service_default, - $disable_boot_timeout = $::os_service_default, - $debug = $::os_service_default, + $command_retry_timeout = $facts['os_service_default'], + $min_command_interval = $facts['os_service_default'], + $use_ipmitool_retries = $facts['os_service_default'], + $kill_on_timeout = $facts['os_service_default'], + $disable_boot_timeout = $facts['os_service_default'], + $debug = $facts['os_service_default'], ) { include ironic::deps diff --git a/manifests/drivers/pxe.pp b/manifests/drivers/pxe.pp index 5f70f60c..461267d8 100644 --- a/manifests/drivers/pxe.pp +++ b/manifests/drivers/pxe.pp @@ -22,53 +22,53 @@ # [*kernel_append_params*] # (optional) Additional append parameters for baremetal PXE boot. # Should be valid pxe parameters -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*pxe_bootfile_name*] # (optional) Bootfile DHCP parameter. # If not set, its value is detected. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*pxe_config_template*] # (optional) Template file for PXE configuration. # If set, should be an valid template file. Otherwise, its value is detected. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*ipxe_bootfile_name*] # (optional) Bootfile DHCP parameter when the ipxe boot interface is set # for a baremetal node. If not set, its value is detected. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*ipxe_config_template*] # (optional) Template file for PXE configuration with the iPXE boot # interface. If set, should be an valid template file. Otherwise, # its value is detected. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*tftp_server*] # (optional) IP address of Ironic compute node's tftp server. # Should be an valid IP address -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*tftp_root*] # (optional) Ironic compute node's tftp root path. # Should be an valid path -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*images_path*] # (optional) Directory where images are stored on disk. # Should be an valid directory -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*tftp_master_path*] # (optional) Directory where master tftp images are stored on disk. # Should be an valid directory -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*instance_master_path*] # (optional) Directory where master tftp images are stored on disk. # Should be an valid directory -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*uefi_pxe_bootfile_name*] # (optional) Bootfile DHCP parameter for UEFI boot mode for the @@ -79,7 +79,7 @@ # # [*uefi_pxe_config_template*] # (optional) Template file for PXE configuration for UEFI boot loader. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*uefi_ipxe_bootfile_name*] # (optional) Bootfile DHCP parameter for UEFI boot mode for the @@ -90,7 +90,7 @@ # [*ipxe_timeout*] # (optional) ipxe timeout in second. # Should be an valid integer -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*enable_ppc64le*] # (optional) Boolean value to dtermine if ppc64le support should be enabled @@ -98,26 +98,26 @@ # # [*boot_retry_timeout*] # (optional) Timeout (in seconds) after which PXE boot should be retried. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*boot_retry_check_interval*] # (optional) How often (in seconds) to check for PXE boot status. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*dir_permission*] # (optional) THe permission that will be applied to the TFTP folders upon # creation. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*file_permission*] # (optional) The permission which is used on files created as part of # configuration and setup of file assets for PXE based operations. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*loader_file_paths*] # (optional) Dictionary describing the bootloaders to load into conductor # PXE/iXPE boot folders values from the host operating system. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # DEPRECATED PARAMETERS # @@ -126,29 +126,29 @@ # Ironic presently attempts both IPv4 and IPv6, this option is effectively # ignored by ironic, and should anticipate being removed in a future # release. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # class ironic::drivers::pxe ( - $kernel_append_params = $::os_service_default, - $pxe_bootfile_name = $::os_service_default, - $pxe_config_template = $::os_service_default, - $ipxe_bootfile_name = $::os_service_default, - $ipxe_config_template = $::os_service_default, - $tftp_server = $::os_service_default, - $tftp_root = $::os_service_default, - $images_path = $::os_service_default, - $tftp_master_path = $::os_service_default, - $instance_master_path = $::os_service_default, + $kernel_append_params = $facts['os_service_default'], + $pxe_bootfile_name = $facts['os_service_default'], + $pxe_config_template = $facts['os_service_default'], + $ipxe_bootfile_name = $facts['os_service_default'], + $ipxe_config_template = $facts['os_service_default'], + $tftp_server = $facts['os_service_default'], + $tftp_root = $facts['os_service_default'], + $images_path = $facts['os_service_default'], + $tftp_master_path = $facts['os_service_default'], + $instance_master_path = $facts['os_service_default'], $uefi_pxe_bootfile_name = 'bootx64.efi', - $uefi_pxe_config_template = $::os_service_default, + $uefi_pxe_config_template = $facts['os_service_default'], $uefi_ipxe_bootfile_name = $::ironic::params::uefi_ipxe_bootfile_name, - $ipxe_timeout = $::os_service_default, + $ipxe_timeout = $facts['os_service_default'], $enable_ppc64le = false, - $boot_retry_timeout = $::os_service_default, - $boot_retry_check_interval = $::os_service_default, - $dir_permission = $::os_service_default, - $file_permission = $::os_service_default, - $loader_file_paths = $::os_service_default, + $boot_retry_timeout = $facts['os_service_default'], + $boot_retry_check_interval = $facts['os_service_default'], + $dir_permission = $facts['os_service_default'], + $file_permission = $facts['os_service_default'], + $loader_file_paths = $facts['os_service_default'], # DEPRECATED PARAMETERS $ip_version = undef, ) inherits ironic::params { @@ -163,7 +163,7 @@ class ironic::drivers::pxe ( if $ip_version != undef { warning('The ironic::drivers::pxe:ip_version parameter is deprecated and will be removed in the future.') } - $ip_version_real = pick($ip_version, $::os_service_default) + $ip_version_real = pick($ip_version, $facts['os_service_default']) # Configure ironic.conf ironic_config { diff --git a/manifests/drivers/redfish.pp b/manifests/drivers/redfish.pp index b61fc82f..7fb1103d 100644 --- a/manifests/drivers/redfish.pp +++ b/manifests/drivers/redfish.pp @@ -21,65 +21,65 @@ # [*connection_attempts*] # (optional) Maximum number of attempts to try to connect to Redfish. # Should be a positive integer value. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*connection_retry_interval*] # (optional) Number of seconds to wait between attempts to connect to Redfish # Should be a positive integer value. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*connection_cache_size*] # (optional) Maximum Redfish client connection cache size. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*auth_type*] # (optional) Redfish HTTP client authentication method. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*use_swift*] # (optional) Upload generated ISO images for virtual media boot to Swift. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*swift_container*] # (optional) The swift container to store Redfish driver data. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*swift_object_expiry_timeout*] # (optional) Amount of time in seconds for Swift objects to auto-expire. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*kernel_append_params*] # (optional) Additional kernel parameters to pass down to the instance kernel -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*file_permission*] # (optional) File permission for swift-less image hosting with the octal # permission representation of file access permissions. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*firmware_update_status_interval*] # (optional) Number of seconds to wait between checking for completed # firmware update tasks. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*firmware_update_fail_interval*] # (optional) Number of seconds to wait between checking for failed firmware # update tasks. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class ironic::drivers::redfish ( $package_ensure = 'present', - $connection_attempts = $::os_service_default, - $connection_retry_interval = $::os_service_default, - $connection_cache_size = $::os_service_default, - $auth_type = $::os_service_default, - $use_swift = $::os_service_default, - $swift_container = $::os_service_default, - $swift_object_expiry_timeout = $::os_service_default, - $kernel_append_params = $::os_service_default, - $file_permission = $::os_service_default, - $firmware_update_status_interval = $::os_service_default, - $firmware_update_fail_interval = $::os_service_default, + $connection_attempts = $facts['os_service_default'], + $connection_retry_interval = $facts['os_service_default'], + $connection_cache_size = $facts['os_service_default'], + $auth_type = $facts['os_service_default'], + $use_swift = $facts['os_service_default'], + $swift_container = $facts['os_service_default'], + $swift_object_expiry_timeout = $facts['os_service_default'], + $kernel_append_params = $facts['os_service_default'], + $file_permission = $facts['os_service_default'], + $firmware_update_status_interval = $facts['os_service_default'], + $firmware_update_fail_interval = $facts['os_service_default'], ) { include ironic::deps diff --git a/manifests/glance.pp b/manifests/glance.pp index 44482c8b..73293c84 100644 --- a/manifests/glance.pp +++ b/manifests/glance.pp @@ -18,7 +18,7 @@ # # [*auth_url*] # The address of the keystone api endpoint. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*project_name*] # The Keystone project name. @@ -30,7 +30,7 @@ # # [*password*] # The admin password for ironic to connect to glance. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*user_domain_name*] # The name of user's domain (required for Identity V3). @@ -42,54 +42,54 @@ # # [*system_scope*] # (Optional) Scope for system operations -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*region_name*] # (optional) Region name for connecting to glance in admin context # through the OpenStack Identity service. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*num_retries*] # (optional) Number retries when downloading an image from glance. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*api_insecure*] # (optional) Allow to perform insecure SSL (https) requests to glance. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*swift_account*] # (optional) The account that Glance uses to communicate with Swift. # The format is "AUTH_uuid". # Can not be set together with swift_account_project_name. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*swift_account_prefix*] # (optional) The prefix added to the project uuid to determine the swift # account. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*swift_container*] # (optional) Swift container where Glance images are stored. Used for # generating temporary URLs. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*swift_endpoint_url*] # (optional) Swift endpoint to use for generating temporary URLs. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*swift_temp_url_key*] # (optional) The secret token given to Swift to allow temporary URL # downloads. Required for several drivers (e.g. agent_ipmitool). -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*swift_temp_url_duration*] # (optional) The length of time in seconds that the temporary URL will be # valid for. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*endpoint_override*] # The endpoint URL for requests for this client -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # DEPRECATED PARAMETERS # @@ -102,23 +102,23 @@ # class ironic::glance ( $auth_type = 'password', - $auth_url = $::os_service_default, + $auth_url = $facts['os_service_default'], $project_name = 'services', $username = 'ironic', - $password = $::os_service_default, + $password = $facts['os_service_default'], $user_domain_name = 'Default', $project_domain_name = 'Default', - $system_scope = $::os_service_default, - $region_name = $::os_service_default, - $num_retries = $::os_service_default, - $api_insecure = $::os_service_default, - $swift_account = $::os_service_default, - $swift_account_prefix = $::os_service_default, - $swift_container = $::os_service_default, - $swift_endpoint_url = $::os_service_default, - $swift_temp_url_key = $::os_service_default, - $swift_temp_url_duration = $::os_service_default, - $endpoint_override = $::os_service_default, + $system_scope = $facts['os_service_default'], + $region_name = $facts['os_service_default'], + $num_retries = $facts['os_service_default'], + $api_insecure = $facts['os_service_default'], + $swift_account = $facts['os_service_default'], + $swift_account_prefix = $facts['os_service_default'], + $swift_container = $facts['os_service_default'], + $swift_endpoint_url = $facts['os_service_default'], + $swift_temp_url_key = $facts['os_service_default'], + $swift_temp_url_duration = $facts['os_service_default'], + $endpoint_override = $facts['os_service_default'], # DEPRECATED PARAMETERS $swift_account_project_name = undef, ) { @@ -137,8 +137,8 @@ class ironic::glance ( $project_name_real = $project_name $project_domain_name_real = $project_domain_name } else { - $project_name_real = $::os_service_default - $project_domain_name_real = $::os_service_default + $project_name_real = $facts['os_service_default'] + $project_domain_name_real = $facts['os_service_default'] } ironic_config { diff --git a/manifests/healthcheck.pp b/manifests/healthcheck.pp index cb680365..ac60dc06 100644 --- a/manifests/healthcheck.pp +++ b/manifests/healthcheck.pp @@ -6,33 +6,33 @@ # # [*enabled*] # (Optional) Enable the healthcheck endpoint at /healthcheck. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*detailed*] # (Optional) Show more detailed information as part of the response. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*backends*] # (Optional) Additional backends that can perform health checks and report # that information back as part of a request. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*disable_by_file_path*] # (Optional) Check the presence of a file to determine if an application # is running on a port. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*disable_by_file_paths*] # (Optional) Check the presence of a file to determine if an application # is running on a port. Expects a "port:path" list of strings. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class ironic::healthcheck ( - $enabled = $::os_service_default, - $detailed = $::os_service_default, - $backends = $::os_service_default, - $disable_by_file_path = $::os_service_default, - $disable_by_file_paths = $::os_service_default, + $enabled = $facts['os_service_default'], + $detailed = $facts['os_service_default'], + $backends = $facts['os_service_default'], + $disable_by_file_path = $facts['os_service_default'], + $disable_by_file_paths = $facts['os_service_default'], ) { include ironic::deps diff --git a/manifests/init.pp b/manifests/init.pp index adc39169..c344b4c0 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -33,11 +33,11 @@ # (optional) IP address of this host. # If unset, will determine the IP programmatically. If unable to do so, will use # "127.0.0.1". -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*my_ipv6*] # (optional) IP address of this host using IPv6. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*auth_strategy*] # (optional) Default protocol to use when connecting to glance @@ -46,38 +46,38 @@ # [*default_resource_class*] # (optional) Default resource class to use for new nodes when no resource # class is explicitly requested. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*executor_thread_pool_size*] # (optional) Size of executor thread pool when executor is threading or eventlet. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*rpc_response_timeout*] # (optional) Seconds to wait for a response from a call. (integer value) -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*rpc_transport*] # (optional) Defines a remote procedure call transport between conductor and # API processes, such as using a messaging broker or JSON RPC. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*control_exchange*] # (optional) What RPC queue/exchange to use (string value) -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_transport_url*] # (optional) A URL representing the messaging driver to use and its full # configuration. Transport URLs take the form: # transport://user:pass@host1:port[,hostN:portN]/virtual_host -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*rabbit_use_ssl*] # (optional) Connect over SSL for RabbitMQ. (boolean value) -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*rabbit_ha_queues*] # (optional) Use HA queues in RabbitMQ. (boolean value) -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*rabbit_heartbeat_timeout_threshold*] # (optional) Number of seconds after which the RabbitMQ broker is considered @@ -85,14 +85,14 @@ # Heartbeating helps to ensure the TCP connection to RabbitMQ isn't silently # closed, resulting in missed or lost messages from the queue. # Requires kombu >= 3.0.7 and amqp >= 1.4.0. (integer value) -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*rabbit_heartbeat_rate*] # (optional) How often during the rabbit_heartbeat_timeout_threshold period # to check the heartbeat on RabbitMQ connection. # i.e. rabbit_heartbeat_rate=2 when rabbit_heartbeat_timeout_threshold=60, # the heartbeat will be checked every 30 seconds. (integer value) -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*rabbit_heartbeat_in_pthread*] # (Optional) EXPERIMENTAL: Run the health check heartbeat thread @@ -102,107 +102,107 @@ # example if the parent process have monkey patched the # stdlib by using eventlet/greenlet then the heartbeat # will be run through a green thread. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*kombu_ssl_ca_certs*] # (optional) SSL certification authority file (valid only if SSL enabled). # (string value) -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*kombu_ssl_certfile*] # (optional) SSL cert file (valid only if SSL enabled). (string value) -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*kombu_ssl_keyfile*] # (optional) SSL key file (valid only if SSL enabled). (string value) -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*kombu_ssl_version*] # (optional) SSL version to use (valid only if SSL enabled). # Valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be # available on some distributions. (string value) -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*kombu_reconnect_delay*] # (optional) How long to wait before reconnecting in response to an AMQP # consumer cancel notification. (floating point value) -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*kombu_failover_strategy*] # (Optional) Determines how the next RabbitMQ node is chosen in case the one # we are currently connected to becomes unavailable. Takes effect only if # more than one RabbitMQ node is provided in config. (string value) -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*kombu_compression*] # (optional) Possible values are: gzip, bz2. If not set compression will not # be used. This option may notbe available in future versions. EXPERIMENTAL. # (string value) -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*amqp_durable_queues*] # (optional) Define queues as "durable" to rabbitmq. (boolean value) -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*amqp_server_request_prefix*] # (Optional) Address prefix used when sending to a specific server -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*amqp_broadcast_prefix*] # (Optional) address prefix used when broadcasting to all servers -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*amqp_group_request_prefix*] # (Optional) address prefix when sending to any server in group -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*amqp_container_name*] # (Optional) Name for the AMQP container -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*amqp_idle_timeout*] # (Optional) Timeout for inactive connections -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*amqp_trace*] # (Optional) Debug: dump AMQP frames to stdout -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*amqp_ssl_ca_file*] # (Optional) CA certificate PEM file to verify server certificate -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*amqp_ssl_cert_file*] # (Optional) Identifying certificate PEM file to present to clients -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*amqp_ssl_key_file*] # (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*] # (Optional) Password for decrypting ssl_key_file (if encrypted) -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*amqp_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*] # (Optional) Path to directory that contains the SASL configuration -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*amqp_sasl_config_name*] # (Optional) Name of configuration file (without .conf suffix) -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*amqp_username*] # (Optional) User name for message broker authentication -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*amqp_password*] # (Optional) Password for message broker authentication -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*sync_db*] # Enable dbsync @@ -221,73 +221,73 @@ # (optional) A URL representing the messaging driver to use for notifications # and its full configuration. Transport URLs take the form: # transport://user:pass@host1:port[,hostN:portN]/virtual_host -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*notification_driver*] # (Optional) Driver or drivers to handle sending notifications. # Value can be a string or a list. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*notification_topics*] # (optional) AMQP topic used for OpenStack notifications -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*notification_level*] # (optional) Notification level for outgoing notifications -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*versioned_notifications_topics*] # (optional) Topics for the versioned notifications issued by Ironic -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class ironic ( $enabled = true, $package_ensure = 'present', - $my_ip = $::os_service_default, - $my_ipv6 = $::os_service_default, + $my_ip = $facts['os_service_default'], + $my_ipv6 = $facts['os_service_default'], $auth_strategy = 'keystone', - $default_resource_class = $::os_service_default, - $control_exchange = $::os_service_default, - $executor_thread_pool_size = $::os_service_default, - $rpc_response_timeout = $::os_service_default, - $rpc_transport = $::os_service_default, - $default_transport_url = $::os_service_default, - $rabbit_use_ssl = $::os_service_default, - $rabbit_heartbeat_timeout_threshold = $::os_service_default, - $rabbit_heartbeat_rate = $::os_service_default, - $rabbit_heartbeat_in_pthread = $::os_service_default, - $rabbit_ha_queues = $::os_service_default, - $kombu_ssl_ca_certs = $::os_service_default, - $kombu_ssl_certfile = $::os_service_default, - $kombu_ssl_keyfile = $::os_service_default, - $kombu_ssl_version = $::os_service_default, - $kombu_reconnect_delay = $::os_service_default, - $kombu_failover_strategy = $::os_service_default, - $kombu_compression = $::os_service_default, - $amqp_durable_queues = $::os_service_default, - $amqp_server_request_prefix = $::os_service_default, - $amqp_broadcast_prefix = $::os_service_default, - $amqp_group_request_prefix = $::os_service_default, - $amqp_container_name = $::os_service_default, - $amqp_idle_timeout = $::os_service_default, - $amqp_trace = $::os_service_default, - $amqp_ssl_ca_file = $::os_service_default, - $amqp_ssl_cert_file = $::os_service_default, - $amqp_ssl_key_file = $::os_service_default, - $amqp_ssl_key_password = $::os_service_default, - $amqp_sasl_mechanisms = $::os_service_default, - $amqp_sasl_config_dir = $::os_service_default, - $amqp_sasl_config_name = $::os_service_default, - $amqp_username = $::os_service_default, - $amqp_password = $::os_service_default, + $default_resource_class = $facts['os_service_default'], + $control_exchange = $facts['os_service_default'], + $executor_thread_pool_size = $facts['os_service_default'], + $rpc_response_timeout = $facts['os_service_default'], + $rpc_transport = $facts['os_service_default'], + $default_transport_url = $facts['os_service_default'], + $rabbit_use_ssl = $facts['os_service_default'], + $rabbit_heartbeat_timeout_threshold = $facts['os_service_default'], + $rabbit_heartbeat_rate = $facts['os_service_default'], + $rabbit_heartbeat_in_pthread = $facts['os_service_default'], + $rabbit_ha_queues = $facts['os_service_default'], + $kombu_ssl_ca_certs = $facts['os_service_default'], + $kombu_ssl_certfile = $facts['os_service_default'], + $kombu_ssl_keyfile = $facts['os_service_default'], + $kombu_ssl_version = $facts['os_service_default'], + $kombu_reconnect_delay = $facts['os_service_default'], + $kombu_failover_strategy = $facts['os_service_default'], + $kombu_compression = $facts['os_service_default'], + $amqp_durable_queues = $facts['os_service_default'], + $amqp_server_request_prefix = $facts['os_service_default'], + $amqp_broadcast_prefix = $facts['os_service_default'], + $amqp_group_request_prefix = $facts['os_service_default'], + $amqp_container_name = $facts['os_service_default'], + $amqp_idle_timeout = $facts['os_service_default'], + $amqp_trace = $facts['os_service_default'], + $amqp_ssl_ca_file = $facts['os_service_default'], + $amqp_ssl_cert_file = $facts['os_service_default'], + $amqp_ssl_key_file = $facts['os_service_default'], + $amqp_ssl_key_password = $facts['os_service_default'], + $amqp_sasl_mechanisms = $facts['os_service_default'], + $amqp_sasl_config_dir = $facts['os_service_default'], + $amqp_sasl_config_name = $facts['os_service_default'], + $amqp_username = $facts['os_service_default'], + $amqp_password = $facts['os_service_default'], $sync_db = true, $db_online_data_migrations = false, $purge_config = false, - $notification_transport_url = $::os_service_default, - $notification_driver = $::os_service_default, - $notification_topics = $::os_service_default, - $notification_level = $::os_service_default, - $versioned_notifications_topics = $::os_service_default, + $notification_transport_url = $facts['os_service_default'], + $notification_driver = $facts['os_service_default'], + $notification_topics = $facts['os_service_default'], + $notification_level = $facts['os_service_default'], + $versioned_notifications_topics = $facts['os_service_default'], ) { include ironic::deps diff --git a/manifests/inspector.pp b/manifests/inspector.pp index 54c618a0..b9363a3c 100644 --- a/manifests/inspector.pp +++ b/manifests/inspector.pp @@ -32,7 +32,7 @@ # [*listen_address*] # (optional) The listen IP for the Ironic-inspector API server. # Should be an valid IP address -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*pxe_transfer_protocol*] # (optional) Protocol preferred for transferring the ramdisk. @@ -50,11 +50,11 @@ # [*timeout*] # (optional) Timeout after which introspection is considered failed, # set to 0 to disable. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*api_max_limit*] # (optional) Limit the number of elements an API list-call returns -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*dnsmasq_interface*] # (optional) The interface for the ironic-inspector dnsmasq process @@ -67,12 +67,12 @@ # # [*always_store_ramdisk_logs*] # (optional) Whether to store ramdisk logs even for successful introspection. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*add_ports*] # (optional) Which MAC addresses to add as ports during introspection. # Allowed values: all, active, pxe. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*keep_ports*] # (optional) Which ports to keep after introspection @@ -146,7 +146,7 @@ # # [*ipxe_timeout*] # (optional) ipxe timeout in second. Should be an integer. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*http_port*] # (optional) port used by the HTTP service serving introspection images. @@ -162,17 +162,17 @@ # # [*detect_boot_mode*] # (optional) Whether to store the boot mode (BIOS or UEFI). -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*node_not_found_hook*] # (optional) Plugin to run when a node is not found during lookup. # For example, "enroll" hook can be used for node auto-discovery. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*discovery_default_driver*] # (optional) The default driver to use for auto-discovered nodes. # Requires node_not_found_hook set to "enroll". -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*enable_ppc64le*] # (optional) Boolean value to determine if ppc64le support should be enabled @@ -202,16 +202,16 @@ class ironic::inspector ( $package_ensure = 'present', $manage_service = true, $enabled = true, - $listen_address = $::os_service_default, + $listen_address = $facts['os_service_default'], $pxe_transfer_protocol = 'tftp', $dhcp_debug = false, $auth_strategy = 'keystone', - $timeout = $::os_service_default, - $api_max_limit = $::os_service_default, + $timeout = $facts['os_service_default'], + $api_max_limit = $facts['os_service_default'], $dnsmasq_interface = 'br-ctlplane', $ramdisk_logs_dir = '/var/log/ironic-inspector/ramdisk/', - $always_store_ramdisk_logs = $::os_service_default, - $add_ports = $::os_service_default, + $always_store_ramdisk_logs = $facts['os_service_default'], + $add_ports = $facts['os_service_default'], $keep_ports = 'all', $store_data = 'none', $dnsmasq_ip_subnets = [], @@ -225,13 +225,13 @@ class ironic::inspector ( $kernel_filename = 'agent.kernel', $additional_processing_hooks = undef, $ramdisk_kernel_args = undef, - $ipxe_timeout = $::os_service_default, + $ipxe_timeout = $facts['os_service_default'], $http_port = '8088', - $detect_boot_mode = $::os_service_default, + $detect_boot_mode = $facts['os_service_default'], $tftp_root = '/tftpboot', $http_root = '/httpboot', - $node_not_found_hook = $::os_service_default, - $discovery_default_driver = $::os_service_default, + $node_not_found_hook = $facts['os_service_default'], + $discovery_default_driver = $facts['os_service_default'], $enable_ppc64le = false, $default_transport_url = 'fake://', $port_physnet_cidr_map = {}, diff --git a/manifests/inspector/authtoken.pp b/manifests/inspector/authtoken.pp index bbb9736f..86b91d5a 100644 --- a/manifests/inspector/authtoken.pp +++ b/manifests/inspector/authtoken.pp @@ -10,7 +10,7 @@ # # [*password*] # (Optional) Password to create for the service user -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*auth_url*] # (Optional) The URL to use for authentication. @@ -30,17 +30,17 @@ # # [*system_scope*] # (Optional) Scope for system operations -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*insecure*] # (Optional) If true, explicitly allow TLS without checking server cert # against any certificate authorities. WARNING: not recommended. Use with # caution. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*auth_section*] # (Optional) Config Section from which to load plugin specific options -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*auth_type*] # (Optional) Authentication type to load @@ -52,26 +52,26 @@ # # [*auth_version*] # (Optional) API version of the admin Identity API endpoint. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*cache*] # (Optional) Env key for the swift cache. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*cafile*] # (Optional) A PEM encoded Certificate Authority to use when verifying HTTPs # connections. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*certfile*] # (Optional) Required if identity server requires client certificate -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*delay_auth_decision*] # (Optional) Do not handle authorization requests within the middleware, but # delegate the authorization decision to downstream WSGI components. Boolean # value -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*enforce_token_bind*] # (Optional) Used to control the use and type of token binding. Can be set @@ -81,57 +81,57 @@ # 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 # must be present in tokens. String value. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*http_connect_timeout*] # (Optional) Request timeout value for communicating with Identity API # server. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*http_request_max_retries*] # (Optional) How many times are we trying to reconnect when communicating # with Identity API Server. Integer value -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*include_service_catalog*] # (Optional) Indicate whether to set the X-Service-Catalog header. If False, # middleware will not ask for service catalog on token validation and will # not set the X-Service-Catalog header. Boolean value. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*keyfile*] # (Optional) Required if identity server requires client certificate -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*memcache_pool_conn_get_timeout*] # (Optional) Number of seconds that an operation will wait to get a memcached # client connection from the pool. Integer value -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*memcache_pool_dead_retry*] # (Optional) Number of seconds memcached server is considered dead before it # is tried again. Integer value -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*memcache_pool_maxsize*] # (Optional) Maximum total number of open connections to every memcached # server. Integer value -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*memcache_pool_socket_timeout*] # (Optional) Number of seconds a connection to memcached is held unused in # the pool before it is closed. Integer value -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*memcache_pool_unused_timeout*] # (Optional) Number of seconds a connection to memcached is held unused in # the pool before it is closed. Integer value -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*memcache_secret_key*] # (Optional, mandatory if memcache_security_strategy is defined) This string # is used for key derivation. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*memcache_security_strategy*] # (Optional) If defined, indicate whether token data should be authenticated @@ -139,17 +139,17 @@ # HMAC) 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 # raise an exception on initialization. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*memcache_use_advanced_pool*] # (Optional) Use the advanced (eventlet safe) memcached client pool. The # advanced pool will only work under python 2.x Boolean value -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*memcached_servers*] # (Optional) Optionally specify a list of memcached server(s) to use for # 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*] # (Optional) Whether to install the python-memcache package. @@ -157,13 +157,13 @@ # # [*region_name*] # (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*] # (Optional) In order to prevent excessive effort spent validating tokens, # the middleware caches previously-seen tokens for a configurable duration # (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*] # (Optional) A choice of roles that must be present in a service token. @@ -173,23 +173,23 @@ # here are applied as an ANY check so any role in this list # must be present. For backwards compatibility reasons this # currently only affects the allow_expired check. (list value) -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*service_token_roles_required*] # (optional) backwards compatibility to ensure that the service tokens are # compared against a list of possible roles for validity # true/false -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*service_type*] # (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. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*interface*] # (Optional) Interface to use for the Identity API endpoint. Valid values are # "public", "internal" or "admin". -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*params*] # (Optional) Hash of additional parameters to pass through to the keystone @@ -197,42 +197,42 @@ # class ironic::inspector::authtoken( $username = 'ironic', - $password = $::os_service_default, + $password = $facts['os_service_default'], $auth_url = 'http://127.0.0.1:5000', $project_name = 'services', $user_domain_name = 'Default', $project_domain_name = 'Default', - $system_scope = $::os_service_default, - $insecure = $::os_service_default, - $auth_section = $::os_service_default, + $system_scope = $facts['os_service_default'], + $insecure = $facts['os_service_default'], + $auth_section = $facts['os_service_default'], $auth_type = 'password', $www_authenticate_uri = 'http://127.0.0.1:5000', - $auth_version = $::os_service_default, - $cache = $::os_service_default, - $cafile = $::os_service_default, - $certfile = $::os_service_default, - $delay_auth_decision = $::os_service_default, - $enforce_token_bind = $::os_service_default, - $http_connect_timeout = $::os_service_default, - $http_request_max_retries = $::os_service_default, - $include_service_catalog = $::os_service_default, - $keyfile = $::os_service_default, - $memcache_pool_conn_get_timeout = $::os_service_default, - $memcache_pool_dead_retry = $::os_service_default, - $memcache_pool_maxsize = $::os_service_default, - $memcache_pool_socket_timeout = $::os_service_default, - $memcache_pool_unused_timeout = $::os_service_default, - $memcache_secret_key = $::os_service_default, - $memcache_security_strategy = $::os_service_default, - $memcache_use_advanced_pool = $::os_service_default, - $memcached_servers = $::os_service_default, + $auth_version = $facts['os_service_default'], + $cache = $facts['os_service_default'], + $cafile = $facts['os_service_default'], + $certfile = $facts['os_service_default'], + $delay_auth_decision = $facts['os_service_default'], + $enforce_token_bind = $facts['os_service_default'], + $http_connect_timeout = $facts['os_service_default'], + $http_request_max_retries = $facts['os_service_default'], + $include_service_catalog = $facts['os_service_default'], + $keyfile = $facts['os_service_default'], + $memcache_pool_conn_get_timeout = $facts['os_service_default'], + $memcache_pool_dead_retry = $facts['os_service_default'], + $memcache_pool_maxsize = $facts['os_service_default'], + $memcache_pool_socket_timeout = $facts['os_service_default'], + $memcache_pool_unused_timeout = $facts['os_service_default'], + $memcache_secret_key = $facts['os_service_default'], + $memcache_security_strategy = $facts['os_service_default'], + $memcache_use_advanced_pool = $facts['os_service_default'], + $memcached_servers = $facts['os_service_default'], $manage_memcache_package = false, - $region_name = $::os_service_default, - $token_cache_time = $::os_service_default, - $service_token_roles = $::os_service_default, - $service_token_roles_required = $::os_service_default, - $service_type = $::os_service_default, - $interface = $::os_service_default, + $region_name = $facts['os_service_default'], + $token_cache_time = $facts['os_service_default'], + $service_token_roles = $facts['os_service_default'], + $service_token_roles_required = $facts['os_service_default'], + $service_type = $facts['os_service_default'], + $interface = $facts['os_service_default'], $params = {} ) { diff --git a/manifests/inspector/cors.pp b/manifests/inspector/cors.pp index c9671c2f..24fcb71f 100644 --- a/manifests/inspector/cors.pp +++ b/manifests/inspector/cors.pp @@ -8,41 +8,41 @@ # (Optional) Indicate whether this resource may be shared with the domain # received in the requests "origin" header. # (string value) -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*allow_credentials*] # (Optional) Indicate that the actual request can include user credentials. # (boolean value) -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*expose_headers*] # (Optional) Indicate which headers are safe to expose to the API. # (list value) -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*max_age*] # (Optional) Maximum cache age of CORS preflight requests. # (integer value) -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*allow_methods*] # (Optional) Indicate which methods can be used during the actual request. # (list value) -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*allow_headers*] # (Optional) Indicate which header field names may be used during the actual # request. # (list value) -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # class ironic::inspector::cors ( - $allowed_origin = $::os_service_default, - $allow_credentials = $::os_service_default, - $expose_headers = $::os_service_default, - $max_age = $::os_service_default, - $allow_methods = $::os_service_default, - $allow_headers = $::os_service_default, + $allowed_origin = $facts['os_service_default'], + $allow_credentials = $facts['os_service_default'], + $expose_headers = $facts['os_service_default'], + $max_age = $facts['os_service_default'], + $allow_methods = $facts['os_service_default'], + $allow_headers = $facts['os_service_default'], ) { include ironic::deps diff --git a/manifests/inspector/db.pp b/manifests/inspector/db.pp index 3119d60f..53b33c13 100644 --- a/manifests/inspector/db.pp +++ b/manifests/inspector/db.pp @@ -10,49 +10,49 @@ # # [*database_connection_recycle_time*] # Timeout when db connections should be reaped. -# (Optional) Defaults to $::os_service_default +# (Optional) Defaults to $facts['os_service_default'] # # [*database_db_max_retries*] # (Optional) Maximum retries in case of connection error or deadlock error # before error is raised. Set to -1 to specify an infinite retry count. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*database_max_retries*] # Maximum db connection retries during startup. # Setting -1 implies an infinite retry count. -# (Optional) Defaults to $::os_service_default +# (Optional) Defaults to $facts['os_service_default'] # # [*database_retry_interval*] # Interval between retries of opening a sql connection. -# (Optional) Defaults to $::os_service_default +# (Optional) Defaults to $facts['os_service_default'] # # [*database_max_pool_size*] # Maximum number of SQL connections to keep open in a pool. -# (Optional) Defaults to $::os_service_default +# (Optional) Defaults to $facts['os_service_default'] # # [*database_max_overflow*] # If set, use this value for max_overflow with sqlalchemy. -# (Optional) Defaults to $::os_service_default +# (Optional) Defaults to $facts['os_service_default'] # # [*database_pool_timeout*] # (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*] # (Optional) If True, transparently enables support for handling MySQL # Cluster (NDB). -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class ironic::inspector::db ( $database_connection = 'sqlite:////var/lib/ironic-inspector/inspector.sqlite', - $database_connection_recycle_time = $::os_service_default, - $database_max_retries = $::os_service_default, - $database_db_max_retries = $::os_service_default, - $database_retry_interval = $::os_service_default, - $database_max_pool_size = $::os_service_default, - $database_max_overflow = $::os_service_default, - $database_pool_timeout = $::os_service_default, - $mysql_enable_ndb = $::os_service_default, + $database_connection_recycle_time = $facts['os_service_default'], + $database_max_retries = $facts['os_service_default'], + $database_db_max_retries = $facts['os_service_default'], + $database_retry_interval = $facts['os_service_default'], + $database_max_pool_size = $facts['os_service_default'], + $database_max_overflow = $facts['os_service_default'], + $database_pool_timeout = $facts['os_service_default'], + $mysql_enable_ndb = $facts['os_service_default'], ) { include ironic::params diff --git a/manifests/inspector/healthcheck.pp b/manifests/inspector/healthcheck.pp index c90d7eb1..8bb6ddec 100644 --- a/manifests/inspector/healthcheck.pp +++ b/manifests/inspector/healthcheck.pp @@ -6,33 +6,33 @@ # # [*enabled*] # (Optional) Enable the healthcheck endpoint at /healthcheck. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*detailed*] # (Optional) Show more detailed information as part of the response. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*backends*] # (Optional) Additional backends that can perform health checks and report # that information back as part of a request. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*disable_by_file_path*] # (Optional) Check the presence of a file to determine if an application # is running on a port. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*disable_by_file_paths*] # (Optional) Check the presence of a file to determine if an application # is running on a port. Expects a "port:path" list of strings. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class ironic::inspector::healthcheck ( - $enabled = $::os_service_default, - $detailed = $::os_service_default, - $backends = $::os_service_default, - $disable_by_file_path = $::os_service_default, - $disable_by_file_paths = $::os_service_default, + $enabled = $facts['os_service_default'], + $detailed = $facts['os_service_default'], + $backends = $facts['os_service_default'], + $disable_by_file_path = $facts['os_service_default'], + $disable_by_file_paths = $facts['os_service_default'], ) { include ironic::deps diff --git a/manifests/inspector/ironic.pp b/manifests/inspector/ironic.pp index f31568c8..1b050a81 100644 --- a/manifests/inspector/ironic.pp +++ b/manifests/inspector/ironic.pp @@ -30,7 +30,7 @@ # # [*password*] # The admin password for ironic-inspector to connect to ironic. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*user_domain_name*] # The name of user's domain (required for Identity V3). @@ -42,46 +42,46 @@ # # [*system_scope*] # (Optional) Scope for system operations -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*region_name*] # (optional) Region name for connecting to ironic in admin context # through the OpenStack Identity service. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*endpoint_override*] # The endpoint URL for requests for this client -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*max_retries*] # (optional) Maximum number of retries in case of conflict error -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*retry_interval*] # (optional) Interval between retries in case of conflict error -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class ironic::inspector::ironic ( $auth_type = 'password', $auth_url = 'http://127.0.0.1:5000/v3', $project_name = 'services', $username = 'ironic', - $password = $::os_service_default, + $password = $facts['os_service_default'], $user_domain_name = 'Default', $project_domain_name = 'Default', - $system_scope = $::os_service_default, - $region_name = $::os_service_default, - $endpoint_override = $::os_service_default, - $max_retries = $::os_service_default, - $retry_interval = $::os_service_default, + $system_scope = $facts['os_service_default'], + $region_name = $facts['os_service_default'], + $endpoint_override = $facts['os_service_default'], + $max_retries = $facts['os_service_default'], + $retry_interval = $facts['os_service_default'], ) { if is_service_default($system_scope) { $project_name_real = $project_name $project_domain_name_real = $project_domain_name } else { - $project_name_real = $::os_service_default - $project_domain_name_real = $::os_service_default + $project_name_real = $facts['os_service_default'] + $project_domain_name_real = $facts['os_service_default'] } ironic_inspector_config { diff --git a/manifests/inspector/logging.pp b/manifests/inspector/logging.pp index 1d05d336..08a992ae 100644 --- a/manifests/inspector/logging.pp +++ b/manifests/inspector/logging.pp @@ -6,67 +6,67 @@ # # [*debug*] # (Optional) Should the daemons log debug messages -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*use_syslog*] # (Optional) Use syslog for logging. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*use_json*] # (Optional) Use json for logging. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*use_stderr*] # (optional) Use stderr for logging -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*log_facility*] # (Optional) Syslog facility to receive log lines. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*log_dir*] # (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/ironic-inspector' # # [*log_file*] # (Optional) File where logs should be stored. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*watch_log_file*] # (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*] # (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\ # [%(request_id)s %(user_identity)s] %(instance)s%(message)s' # # [*logging_default_format_string*] # (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\ # [-] %(instance)s%(message)s' # # [*logging_debug_format_suffix*] # (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' # # [*logging_exception_prefix*] # (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' # # [*log_config_append*] # 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 # # [*default_log_levels*] # (optional) Hash of logger (keys) and level (values) pairs. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # Example: # { 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN', # 'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN', @@ -74,49 +74,49 @@ # # [*publish_errors*] # (optional) Publish error events (boolean value). -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*fatal_deprecations*] # (optional) Make deprecations fatal (boolean value) -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*instance_format*] # (optional) If an instance is passed with the log message, format it # like this (string value). -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # Example: '[instance: %(uuid)s] ' # # [*instance_uuid_format*] # (optional) If an instance UUID is passed with the log message, format # it like this (string value). -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # Example: instance_uuid_format='[instance: %(uuid)s] ' # # [*log_date_format*] # (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' # class ironic::inspector::logging( - $use_syslog = $::os_service_default, - $use_json = $::os_service_default, - $use_stderr = $::os_service_default, - $log_facility = $::os_service_default, + $use_syslog = $facts['os_service_default'], + $use_json = $facts['os_service_default'], + $use_stderr = $facts['os_service_default'], + $log_facility = $facts['os_service_default'], $log_dir = '/var/log/ironic-inspector', - $log_file = $::os_service_default, - $watch_log_file = $::os_service_default, - $debug = $::os_service_default, - $logging_context_format_string = $::os_service_default, - $logging_default_format_string = $::os_service_default, - $logging_debug_format_suffix = $::os_service_default, - $logging_exception_prefix = $::os_service_default, - $log_config_append = $::os_service_default, - $default_log_levels = $::os_service_default, - $publish_errors = $::os_service_default, - $fatal_deprecations = $::os_service_default, - $instance_format = $::os_service_default, - $instance_uuid_format = $::os_service_default, - $log_date_format = $::os_service_default, + $log_file = $facts['os_service_default'], + $watch_log_file = $facts['os_service_default'], + $debug = $facts['os_service_default'], + $logging_context_format_string = $facts['os_service_default'], + $logging_default_format_string = $facts['os_service_default'], + $logging_debug_format_suffix = $facts['os_service_default'], + $logging_exception_prefix = $facts['os_service_default'], + $log_config_append = $facts['os_service_default'], + $default_log_levels = $facts['os_service_default'], + $publish_errors = $facts['os_service_default'], + $fatal_deprecations = $facts['os_service_default'], + $instance_format = $facts['os_service_default'], + $instance_uuid_format = $facts['os_service_default'], + $log_date_format = $facts['os_service_default'], ) { include ironic::deps diff --git a/manifests/inspector/policy.pp b/manifests/inspector/policy.pp index b1a9cb80..7cd3cd5e 100644 --- a/manifests/inspector/policy.pp +++ b/manifests/inspector/policy.pp @@ -6,12 +6,12 @@ # # [*enforce_scope*] # (Optional) Whether or not to enforce scope when evaluating policies. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*enforce_new_defaults*] # (Optional) Whether or not to use old deprecated defaults when evaluating # policies. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*policies*] # (Optional) Set of policies to configure for ironic-inspector @@ -34,11 +34,11 @@ # # [*policy_default_rule*] # (Optional) Default rule. Enforced when a requested rule is not found. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*policy_dirs*] # (Optional) Path to the ironic-inspector policy folder -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*purge_config*] # (optional) Whether to set only the specified policy rules in the policy @@ -46,12 +46,12 @@ # Defaults to false. # class ironic::inspector::policy ( - $enforce_scope = $::os_service_default, - $enforce_new_defaults = $::os_service_default, + $enforce_scope = $facts['os_service_default'], + $enforce_new_defaults = $facts['os_service_default'], $policies = {}, $policy_path = '/etc/ironic-inspector/policy.yaml', - $policy_default_rule = $::os_service_default, - $policy_dirs = $::os_service_default, + $policy_default_rule = $facts['os_service_default'], + $policy_dirs = $facts['os_service_default'], $purge_config = false, ) { diff --git a/manifests/inspector/pxe_filter.pp b/manifests/inspector/pxe_filter.pp index 4cb5752c..0108b9ad 100644 --- a/manifests/inspector/pxe_filter.pp +++ b/manifests/inspector/pxe_filter.pp @@ -16,16 +16,16 @@ # # [*driver*] # (optional) PXE filter driver to use. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*sync_period*] # (optional) Number of seconds between periodic updates of filters. # Should be a non-negative integer value. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # class ironic::inspector::pxe_filter ( - $driver = $::os_service_default, - $sync_period = $::os_service_default, + $driver = $facts['os_service_default'], + $sync_period = $facts['os_service_default'], ) { include ironic::deps diff --git a/manifests/inspector/pxe_filter/dnsmasq.pp b/manifests/inspector/pxe_filter/dnsmasq.pp index db0b7bc8..31406efc 100644 --- a/manifests/inspector/pxe_filter/dnsmasq.pp +++ b/manifests/inspector/pxe_filter/dnsmasq.pp @@ -16,11 +16,11 @@ # # [*dnsmasq_start_command*] # (optional) A (shell) command line to start the dnsmasq service. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*dnsmasq_stop_command*] # (optional) A (shell) command line to stop the dnsmasq service. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*purge_dhcp_hostsdir*] # (optional) Purge the hostsdir upon driver initialization. Setting to false @@ -28,18 +28,18 @@ # there are multiple processes executing inside of the same host and # namespace. In this case, the Operator is responsible for setting up a # custom cleaning facility. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # class ironic::inspector::pxe_filter::dnsmasq ( - $dnsmasq_start_command = $::os_service_default, - $dnsmasq_stop_command = $::os_service_default, - $purge_dhcp_hostsdir = $::os_service_default, + $dnsmasq_start_command = $facts['os_service_default'], + $dnsmasq_stop_command = $facts['os_service_default'], + $purge_dhcp_hostsdir = $facts['os_service_default'], ) { include ironic::deps include ironic::inspector - $hostsdir = pick($::ironic::inspector::dnsmasq_dhcp_hostsdir, $::os_service_default) + $hostsdir = pick($::ironic::inspector::dnsmasq_dhcp_hostsdir, $facts['os_service_default']) ironic_inspector_config { 'dnsmasq_pxe_filter/dhcp_hostsdir': value => $hostsdir; diff --git a/manifests/inspector/service_catalog.pp b/manifests/inspector/service_catalog.pp index dcf2aa04..7c94e8a1 100644 --- a/manifests/inspector/service_catalog.pp +++ b/manifests/inspector/service_catalog.pp @@ -18,7 +18,7 @@ # # [*auth_url*] # The address of the keystone api endpoint. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*project_name*] # The Keystone project name. @@ -30,7 +30,7 @@ # # [*password*] # The admin password for ironic-inspector to connect to the service catalog. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*user_domain_name*] # The name of user's domain (required for Identity V3). @@ -42,28 +42,28 @@ # # [*system_scope*] # (Optional) Scope for system operations -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*region_name*] # (optional) Region name for accessing Keystone catalog # through the OpenStack Identity service. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*endpoint_override*] # The endpoint URL for requests for this client -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class ironic::inspector::service_catalog ( $auth_type = 'password', - $auth_url = $::os_service_default, + $auth_url = $facts['os_service_default'], $project_name = 'services', $username = 'ironic', - $password = $::os_service_default, + $password = $facts['os_service_default'], $user_domain_name = 'Default', $project_domain_name = 'Default', - $system_scope = $::os_service_default, - $region_name = $::os_service_default, - $endpoint_override = $::os_service_default, + $system_scope = $facts['os_service_default'], + $region_name = $facts['os_service_default'], + $endpoint_override = $facts['os_service_default'], ) { include ironic::deps @@ -72,8 +72,8 @@ class ironic::inspector::service_catalog ( $project_name_real = $project_name $project_domain_name_real = $project_domain_name } else { - $project_name_real = $::os_service_default - $project_domain_name_real = $::os_service_default + $project_name_real = $facts['os_service_default'] + $project_domain_name_real = $facts['os_service_default'] } ironic_inspector_config { diff --git a/manifests/inspector/swift.pp b/manifests/inspector/swift.pp index a891d4ea..36a05caf 100644 --- a/manifests/inspector/swift.pp +++ b/manifests/inspector/swift.pp @@ -18,7 +18,7 @@ # # [*auth_url*] # The address of the keystone api endpoint. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*project_name*] # The Keystone project name. @@ -30,7 +30,7 @@ # # [*password*] # The admin password for ironic-inspector to connect to swift. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*user_domain_name*] # The name of user's domain (required for Identity V3). @@ -42,48 +42,48 @@ # # [*system_scope*] # (Optional) Scope for system operations -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*region_name*] # (optional) Region name for connecting to swift in admin context # through the OpenStack Identity service. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*endpoint_override*] # The endpoint URL for requests for this client -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*container*] # (optional) Default Swift container name to use when creating objects. # String value -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*delete_after*] # (optional) Number of seconds that the Swift object will last before being # deleted. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class ironic::inspector::swift ( $auth_type = 'password', - $auth_url = $::os_service_default, + $auth_url = $facts['os_service_default'], $project_name = 'services', $username = 'ironic', - $password = $::os_service_default, + $password = $facts['os_service_default'], $user_domain_name = 'Default', $project_domain_name = 'Default', - $system_scope = $::os_service_default, - $region_name = $::os_service_default, - $endpoint_override = $::os_service_default, - $container = $::os_service_default, - $delete_after = $::os_service_default, + $system_scope = $facts['os_service_default'], + $region_name = $facts['os_service_default'], + $endpoint_override = $facts['os_service_default'], + $container = $facts['os_service_default'], + $delete_after = $facts['os_service_default'], ) { if is_service_default($system_scope) { $project_name_real = $project_name $project_domain_name_real = $project_domain_name } else { - $project_name_real = $::os_service_default - $project_domain_name_real = $::os_service_default + $project_name_real = $facts['os_service_default'] + $project_domain_name_real = $facts['os_service_default'] } ironic_inspector_config { diff --git a/manifests/inventory.pp b/manifests/inventory.pp index 8d94de2c..60517acc 100644 --- a/manifests/inventory.pp +++ b/manifests/inventory.pp @@ -6,16 +6,16 @@ # # [*data_backend*] # (Optional) The storage backend for storing introspection data. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*swift_data_container*] # (Optional) The Swift introspection data container to store the inventory # data. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # class ironic::inventory ( - $data_backend = $::os_service_default, - $swift_data_container = $::os_service_default, + $data_backend = $facts['os_service_default'], + $swift_data_container = $facts['os_service_default'], ) { include ironic::deps diff --git a/manifests/json_rpc.pp b/manifests/json_rpc.pp index b9fe3d46..d58557c1 100644 --- a/manifests/json_rpc.pp +++ b/manifests/json_rpc.pp @@ -23,15 +23,15 @@ # [*http_basic_auth_user_file*] # (optional) Path to Apache format user authentication file used when # using auth_strategy=http_basic. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*host_ip*] # (optional) The IP address or hostname on which JSON RPC will listen. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*port*] # (optional) The port to use for JSON RPC'. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*use_ssl*] # (optional) Whether to use TLS for JSON RPC'. @@ -43,7 +43,7 @@ # # [*auth_url*] # (optional) The address of the keystone api endpoint. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*project_name*] # (optional) The Keystone project name. @@ -55,7 +55,7 @@ # # [*password*] # (optional) The admin password for ironic to connect to json_rpc. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*user_domain_name*] # (optional) The name of user's domain (required for Identity V3). @@ -67,38 +67,38 @@ # # [*system_scope*] # (Optional) Scope for system operations -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*allowed_roles*] # (optional) List of roles allowed to use JSON RPC. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*endpoint_override*] # (optional) The endpoint URL for requests for this client -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*region_name*] # (optional) Region name for connecting to swift in admin context # through the OpenStack Identity service. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class ironic::json_rpc ( $auth_strategy = 'keystone', - $http_basic_auth_user_file = $::os_service_default, - $host_ip = $::os_service_default, - $port = $::os_service_default, + $http_basic_auth_user_file = $facts['os_service_default'], + $host_ip = $facts['os_service_default'], + $port = $facts['os_service_default'], $use_ssl = false, $auth_type = 'password', - $auth_url = $::os_service_default, + $auth_url = $facts['os_service_default'], $project_name = 'services', $username = 'ironic', - $password = $::os_service_default, + $password = $facts['os_service_default'], $user_domain_name = 'Default', $project_domain_name = 'Default', - $system_scope = $::os_service_default, - $allowed_roles = $::os_service_default, - $endpoint_override = $::os_service_default, - $region_name = $::os_service_default, + $system_scope = $facts['os_service_default'], + $allowed_roles = $facts['os_service_default'], + $endpoint_override = $facts['os_service_default'], + $region_name = $facts['os_service_default'], ) { include ironic::deps @@ -107,8 +107,8 @@ class ironic::json_rpc ( $project_name_real = $project_name $project_domain_name_real = $project_domain_name } else { - $project_name_real = $::os_service_default - $project_domain_name_real = $::os_service_default + $project_name_real = $facts['os_service_default'] + $project_domain_name_real = $facts['os_service_default'] } ironic_config { diff --git a/manifests/logging.pp b/manifests/logging.pp index f500268e..1486d336 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -6,71 +6,71 @@ # # [*debug*] # (Optional) Should the daemons log debug messages -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*use_syslog*] # (Optional) Use syslog for logging. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*use_json*] # (Optional) Use json for logging. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*use_journal*] # (Optional) Use journal for logging. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*use_stderr*] # (Optional) Use stderr for logging -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*log_facility*] # (Optional) Syslog facility to receive log lines. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*log_dir*] # (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/ironic' # # [*log_file*] # (Optional) File where logs should be stored. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*watch_log_file*] # (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*] # (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\ # [%(request_id)s %(user_identity)s] %(instance)s%(message)s' # # [*logging_default_format_string*] # (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\ # [-] %(instance)s%(message)s' # # [*logging_debug_format_suffix*] # (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' # # [*logging_exception_prefix*] # (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' # # [*log_config_append*] # (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 # # [*default_log_levels*] # (Optional) Hash of logger (keys) and level (values) pairs. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # Example: # { 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN', # 'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN', @@ -78,50 +78,50 @@ # # [*publish_errors*] # (Optional) Publish error events (boolean value). -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*fatal_deprecations*] # (Optional) Make deprecations fatal (boolean value) -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*instance_format*] # (Optional) If an instance is passed with the log message, format it # like this (string value). -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # Example: '[instance: %(uuid)s] ' # # [*instance_uuid_format*] # (Optional) If an instance UUID is passed with the log message, format # it like this (string value). -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # Example: instance_uuid_format='[instance: %(uuid)s] ' # # [*log_date_format*] # (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' # class ironic::logging( - $use_syslog = $::os_service_default, - $use_json = $::os_service_default, - $use_journal = $::os_service_default, - $use_stderr = $::os_service_default, - $log_facility = $::os_service_default, + $use_syslog = $facts['os_service_default'], + $use_json = $facts['os_service_default'], + $use_journal = $facts['os_service_default'], + $use_stderr = $facts['os_service_default'], + $log_facility = $facts['os_service_default'], $log_dir = '/var/log/ironic', - $log_file = $::os_service_default, - $watch_log_file = $::os_service_default, - $debug = $::os_service_default, - $logging_context_format_string = $::os_service_default, - $logging_default_format_string = $::os_service_default, - $logging_debug_format_suffix = $::os_service_default, - $logging_exception_prefix = $::os_service_default, - $log_config_append = $::os_service_default, - $default_log_levels = $::os_service_default, - $publish_errors = $::os_service_default, - $fatal_deprecations = $::os_service_default, - $instance_format = $::os_service_default, - $instance_uuid_format = $::os_service_default, - $log_date_format = $::os_service_default, + $log_file = $facts['os_service_default'], + $watch_log_file = $facts['os_service_default'], + $debug = $facts['os_service_default'], + $logging_context_format_string = $facts['os_service_default'], + $logging_default_format_string = $facts['os_service_default'], + $logging_debug_format_suffix = $facts['os_service_default'], + $logging_exception_prefix = $facts['os_service_default'], + $log_config_append = $facts['os_service_default'], + $default_log_levels = $facts['os_service_default'], + $publish_errors = $facts['os_service_default'], + $fatal_deprecations = $facts['os_service_default'], + $instance_format = $facts['os_service_default'], + $instance_uuid_format = $facts['os_service_default'], + $log_date_format = $facts['os_service_default'], ) { include ironic::deps diff --git a/manifests/neutron.pp b/manifests/neutron.pp index 8177cf91..e1caf1c2 100644 --- a/manifests/neutron.pp +++ b/manifests/neutron.pp @@ -18,7 +18,7 @@ # # [*auth_url*] # The address of the keystone api endpoint. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*project_name*] # The Keystone project name. @@ -30,7 +30,7 @@ # # [*password*] # The admin password for ironic to connect to neutron. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*user_domain_name*] # The name of user's domain (required for Identity V3). @@ -42,16 +42,16 @@ # # [*system_scope*] # (Optional) Scope for system operations -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*region_name*] # (optional) Region name for connecting to neutron in admin context # through the OpenStack Identity service. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*endpoint_override*] # The endpoint URL for requests for this client -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*dhcpv6_stateful_address_count*] # Number of IPv6 addresses to allocate for ports created for provisioning, @@ -60,28 +60,28 @@ # CLID/IAID. Due to non-identical identifiers multiple addresses must be # reserved for the host to ensure each step of the boot process can # successfully lease addresses. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class ironic::neutron ( $auth_type = 'password', - $auth_url = $::os_service_default, + $auth_url = $facts['os_service_default'], $project_name = 'services', $username = 'ironic', - $password = $::os_service_default, + $password = $facts['os_service_default'], $user_domain_name = 'Default', $project_domain_name = 'Default', - $system_scope = $::os_service_default, - $region_name = $::os_service_default, - $endpoint_override = $::os_service_default, - $dhcpv6_stateful_address_count = $::os_service_default, + $system_scope = $facts['os_service_default'], + $region_name = $facts['os_service_default'], + $endpoint_override = $facts['os_service_default'], + $dhcpv6_stateful_address_count = $facts['os_service_default'], ) { if is_service_default($system_scope) { $project_name_real = $project_name $project_domain_name_real = $project_domain_name } else { - $project_name_real = $::os_service_default - $project_domain_name_real = $::os_service_default + $project_name_real = $facts['os_service_default'] + $project_domain_name_real = $facts['os_service_default'] } ironic_config { diff --git a/manifests/nova.pp b/manifests/nova.pp index 43ca2545..2b3dd4d2 100644 --- a/manifests/nova.pp +++ b/manifests/nova.pp @@ -18,7 +18,7 @@ # # [*auth_url*] # The address of the keystone api endpoint. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*project_name*] # The Keystone project name. @@ -30,7 +30,7 @@ # # [*password*] # The admin password for ironic to connect to nova. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*user_domain_name*] # The name of user's domain (required for Identity V3). @@ -42,33 +42,33 @@ # # [*system_scope*] # (Optional) Scope for system operations -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*region_name*] # (optional) Region name for connecting to nova in admin context # through the OpenStack Identity service. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*endpoint_override*] # The endpoint URL for requests for this client -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*send_power_notifications*] # Enable the support for power state change callbacks to nova. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class ironic::nova ( $auth_type = 'password', - $auth_url = $::os_service_default, + $auth_url = $facts['os_service_default'], $project_name = 'services', $username = 'ironic', - $password = $::os_service_default, + $password = $facts['os_service_default'], $user_domain_name = 'Default', $project_domain_name = 'Default', - $system_scope = $::os_service_default, - $region_name = $::os_service_default, - $endpoint_override = $::os_service_default, - $send_power_notifications = $::os_service_default, + $system_scope = $facts['os_service_default'], + $region_name = $facts['os_service_default'], + $endpoint_override = $facts['os_service_default'], + $send_power_notifications = $facts['os_service_default'], ) { include ironic::deps @@ -77,8 +77,8 @@ class ironic::nova ( $project_name_real = $project_name $project_domain_name_real = $project_domain_name } else { - $project_name_real = $::os_service_default - $project_domain_name_real = $::os_service_default + $project_name_real = $facts['os_service_default'] + $project_domain_name_real = $facts['os_service_default'] } ironic_config { diff --git a/manifests/params.pp b/manifests/params.pp index c34e269b..707dfc9a 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -37,7 +37,7 @@ class ironic::params { $proliantutils_package_name = 'python3-proliantutils' $dracclient_package_name = 'python3-dracclient' - case $::osfamily { + case $facts['os']['family'] { 'RedHat': { $common_package_name = 'openstack-ironic-common' $api_package = 'openstack-ironic-api' @@ -104,8 +104,7 @@ class ironic::params { $shim_file = '/usr/lib/shim/shimx64.efi.signed' } default: { - fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, \ -module ${module_name} only support osfamily RedHat and Debian") + fail("Unsupported osfamily: ${facts['os']['family']}") } } diff --git a/manifests/policy.pp b/manifests/policy.pp index 6788c050..b8e934bc 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -6,12 +6,12 @@ # # [*enforce_scope*] # (Optional) Whether or not to enforce scope when evaluating policies. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*enforce_new_defaults*] # (Optional) Whether or not to use old deprecated defaults when evaluating # policies. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*policies*] # (Optional) Set of policies to configure for ironic @@ -34,11 +34,11 @@ # # [*policy_default_rule*] # (Optional) Default rule. Enforced when a requested rule is not found. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*policy_dirs*] # (Optional) Path to the ironic policy folder -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*purge_config*] # (optional) Whether to set only the specified policy rules in the policy @@ -46,12 +46,12 @@ # Defaults to false. # class ironic::policy ( - $enforce_scope = $::os_service_default, - $enforce_new_defaults = $::os_service_default, + $enforce_scope = $facts['os_service_default'], + $enforce_new_defaults = $facts['os_service_default'], $policies = {}, $policy_path = '/etc/ironic/policy.yaml', - $policy_default_rule = $::os_service_default, - $policy_dirs = $::os_service_default, + $policy_default_rule = $facts['os_service_default'], + $policy_dirs = $facts['os_service_default'], $purge_config = false, ) { diff --git a/manifests/pxe.pp b/manifests/pxe.pp index 3bfc9a7d..b270a78b 100644 --- a/manifests/pxe.pp +++ b/manifests/pxe.pp @@ -119,8 +119,8 @@ class ironic::pxe ( $uefi_ipxe_bootfile_name_real = pick($::ironic::pxe::common::uefi_ipxe_bootfile_name, $uefi_ipxe_bootfile_name) $uefi_pxe_bootfile_name_real = pick($::ironic::pxe::common::uefi_pxe_bootfile_name, $uefi_pxe_bootfile_name) - if $::os['family'] == 'RedHat' { - $arch = "-${::os['architecture']}" + if $facts['os']['family'] == 'RedHat' { + $arch = "-${facts['os']['architecture']}" } else { $arch = '' } diff --git a/manifests/service_catalog.pp b/manifests/service_catalog.pp index 9065d6d9..dce5e60b 100644 --- a/manifests/service_catalog.pp +++ b/manifests/service_catalog.pp @@ -18,7 +18,7 @@ # # [*auth_url*] # The address of the keystone api endpoint. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*project_name*] # The Keystone project name. @@ -30,7 +30,7 @@ # # [*password*] # The admin password for ironic to connect to the service catalog. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*user_domain_name*] # The name of user's domain (required for Identity V3). @@ -42,28 +42,28 @@ # # [*system_scope*] # (Optional) Scope for system operations -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*region_name*] # (optional) Region name for accessing Keystone catalog # through the OpenStack Identity service. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*endpoint_override*] # The endpoint URL for requests for this client -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class ironic::service_catalog ( $auth_type = 'password', - $auth_url = $::os_service_default, + $auth_url = $facts['os_service_default'], $project_name = 'services', $username = 'ironic', - $password = $::os_service_default, + $password = $facts['os_service_default'], $user_domain_name = 'Default', $project_domain_name = 'Default', - $system_scope = $::os_service_default, - $region_name = $::os_service_default, - $endpoint_override = $::os_service_default, + $system_scope = $facts['os_service_default'], + $region_name = $facts['os_service_default'], + $endpoint_override = $facts['os_service_default'], ) { include ironic::deps @@ -72,8 +72,8 @@ class ironic::service_catalog ( $project_name_real = $project_name $project_domain_name_real = $project_domain_name } else { - $project_name_real = $::os_service_default - $project_domain_name_real = $::os_service_default + $project_name_real = $facts['os_service_default'] + $project_domain_name_real = $facts['os_service_default'] } ironic_config { diff --git a/manifests/swift.pp b/manifests/swift.pp index c13ba4d2..a51c9605 100644 --- a/manifests/swift.pp +++ b/manifests/swift.pp @@ -18,7 +18,7 @@ # # [*auth_url*] # The address of the keystone api endpoint. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*project_name*] # The Keystone project name. @@ -30,7 +30,7 @@ # # [*password*] # The admin password for ironic to connect to swift. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*user_domain_name*] # The name of user's domain (required for Identity V3). @@ -42,28 +42,28 @@ # # [*system_scope*] # (Optional) Scope for system operations -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*region_name*] # (optional) Region name for connecting to swift in admin context # through the OpenStack Identity service. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*endpoint_override*] # The endpoint URL for requests for this client -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class ironic::swift ( $auth_type = 'password', - $auth_url = $::os_service_default, + $auth_url = $facts['os_service_default'], $project_name = 'services', $username = 'ironic', - $password = $::os_service_default, + $password = $facts['os_service_default'], $user_domain_name = 'Default', $project_domain_name = 'Default', - $system_scope = $::os_service_default, - $region_name = $::os_service_default, - $endpoint_override = $::os_service_default, + $system_scope = $facts['os_service_default'], + $region_name = $facts['os_service_default'], + $endpoint_override = $facts['os_service_default'], ) { include ironic::deps @@ -72,8 +72,8 @@ class ironic::swift ( $project_name_real = $project_name $project_domain_name_real = $project_domain_name } else { - $project_name_real = $::os_service_default - $project_domain_name_real = $::os_service_default + $project_name_real = $facts['os_service_default'] + $project_domain_name_real = $facts['os_service_default'] } ironic_config { diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index 68843973..93185625 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -23,7 +23,7 @@ # # [*servername*] # (Optional) The servername for the virtualhost. -# Defaults to $::fqdn +# Defaults to $facts['networking']['fqdn'] # # [*port*] # (Optional) The port. @@ -43,7 +43,7 @@ # # [*workers*] # (Optional) Number of WSGI workers to spawn. -# Defaults to $::os_workers +# Defaults to $facts['os_workers'] # # [*priority*] # (Optional) The priority for the vhost. @@ -130,12 +130,12 @@ # class ironic::wsgi::apache ( - $servername = $::fqdn, + $servername = $facts['networking']['fqdn'], $port = 6385, $bind_host = undef, $path = '/', $ssl = false, - $workers = $::os_workers, + $workers = $facts['os_workers'], $ssl_cert = undef, $ssl_key = undef, $ssl_chain = undef, diff --git a/spec/classes/ironic_api_spec.rb b/spec/classes/ironic_api_spec.rb index 25941cfb..c16dbf69 100644 --- a/spec/classes/ironic_api_spec.rb +++ b/spec/classes/ironic_api_spec.rb @@ -161,7 +161,7 @@ describe 'ironic::api' do end let :platform_params do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :api_package => 'ironic-api', :api_service => 'ironic-api' } diff --git a/spec/classes/ironic_client_spec.rb b/spec/classes/ironic_client_spec.rb index 95e45a17..8766fd7d 100644 --- a/spec/classes/ironic_client_spec.rb +++ b/spec/classes/ironic_client_spec.rb @@ -47,7 +47,7 @@ describe 'ironic::client' do end let(:platform_params) do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :client_package => 'python3-ironicclient' } when 'RedHat' diff --git a/spec/classes/ironic_conductor_spec.rb b/spec/classes/ironic_conductor_spec.rb index b58f9bfc..4a710be1 100644 --- a/spec/classes/ironic_conductor_spec.rb +++ b/spec/classes/ironic_conductor_spec.rb @@ -201,7 +201,7 @@ describe 'ironic::conductor' do facts.merge!(OSDefaults.get_facts()) end - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' let :platform_params do { :conductor_package => 'ironic-conductor', diff --git a/spec/classes/ironic_db_spec.rb b/spec/classes/ironic_db_spec.rb index b830f3d6..a3ad3285 100644 --- a/spec/classes/ironic_db_spec.rb +++ b/spec/classes/ironic_db_spec.rb @@ -54,10 +54,7 @@ describe 'ironic::db' do }).each do |os,facts| context "on #{os}" do let (:facts) do - facts.merge!(OSDefaults.get_facts({ - :concat_basedir => '/var/lib/puppet/concat', - :fqdn => 'some.host.tld', - })) + facts.merge!(OSDefaults.get_facts()) end it_behaves_like 'ironic::db' diff --git a/spec/classes/ironic_drivers_ansible_spec.rb b/spec/classes/ironic_drivers_ansible_spec.rb index 2b49ec01..2bc2afbc 100644 --- a/spec/classes/ironic_drivers_ansible_spec.rb +++ b/spec/classes/ironic_drivers_ansible_spec.rb @@ -93,7 +93,7 @@ describe 'ironic::drivers::ansible' do end let :platform_params do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :systemd_python_package => 'python-systemd' } when 'RedHat' diff --git a/spec/classes/ironic_drivers_drac_spec.rb b/spec/classes/ironic_drivers_drac_spec.rb index c9bc07a8..18b78c4a 100644 --- a/spec/classes/ironic_drivers_drac_spec.rb +++ b/spec/classes/ironic_drivers_drac_spec.rb @@ -42,7 +42,7 @@ describe 'ironic::drivers::drac' do end let (:platform_params) do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :dracclient_package_name => 'python3-dracclient' } when 'RedHat' diff --git a/spec/classes/ironic_drivers_ilo_spec.rb b/spec/classes/ironic_drivers_ilo_spec.rb index ebaefd85..df175ba7 100644 --- a/spec/classes/ironic_drivers_ilo_spec.rb +++ b/spec/classes/ironic_drivers_ilo_spec.rb @@ -67,7 +67,7 @@ describe 'ironic::drivers::ilo' do end let (:platform_params) do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :proliantutils_package_name => 'python3-proliantutils' } when 'RedHat' diff --git a/spec/classes/ironic_drivers_pxe_spec.rb b/spec/classes/ironic_drivers_pxe_spec.rb index a3b4f415..6532857e 100644 --- a/spec/classes/ironic_drivers_pxe_spec.rb +++ b/spec/classes/ironic_drivers_pxe_spec.rb @@ -115,10 +115,7 @@ describe 'ironic::drivers::pxe' do }).each do |os,facts| context "on #{os}" do let (:facts) do - facts.merge!(OSDefaults.get_facts({ - :concat_basedir => '/var/lib/puppet/concat', - :fqdn => 'some.host.tld', - })) + facts.merge!(OSDefaults.get_facts()) end let :platform_params do diff --git a/spec/classes/ironic_drivers_redfish_spec.rb b/spec/classes/ironic_drivers_redfish_spec.rb index bf7999e6..54acd178 100644 --- a/spec/classes/ironic_drivers_redfish_spec.rb +++ b/spec/classes/ironic_drivers_redfish_spec.rb @@ -91,7 +91,7 @@ describe 'ironic::drivers::redfish' do end let (:platform_params) do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :sushy_package_name => 'python3-sushy' } when 'RedHat' diff --git a/spec/classes/ironic_drivers_staging_spec.rb b/spec/classes/ironic_drivers_staging_spec.rb index 14a16167..dfaf7fcb 100644 --- a/spec/classes/ironic_drivers_staging_spec.rb +++ b/spec/classes/ironic_drivers_staging_spec.rb @@ -49,7 +49,7 @@ describe 'ironic::drivers::staging' do facts.merge!(OSDefaults.get_facts()) end - if facts[:osfamily] == 'RedHat' + if facts[:os]['family'] == 'RedHat' it_configures 'ironic-staging-drivers' end end diff --git a/spec/classes/ironic_init_spec.rb b/spec/classes/ironic_init_spec.rb index 54b9f3cd..04d7de34 100644 --- a/spec/classes/ironic_init_spec.rb +++ b/spec/classes/ironic_init_spec.rb @@ -284,14 +284,11 @@ describe 'ironic' do }).each do |os,facts| context "on #{os}" do let (:facts) do - facts.merge!(OSDefaults.get_facts({ - :concat_basedir => '/var/lib/puppet/concat', - :fqdn => 'some.host.tld', - })) + facts.merge!(OSDefaults.get_facts()) end let :platform_params do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :common_package_name => 'ironic-common', :lib_package_name => 'python3-ironic-lib' } diff --git a/spec/classes/ironic_inspector_client_spec.rb b/spec/classes/ironic_inspector_client_spec.rb index 99b1ba77..f9700b27 100644 --- a/spec/classes/ironic_inspector_client_spec.rb +++ b/spec/classes/ironic_inspector_client_spec.rb @@ -52,7 +52,7 @@ describe 'ironic::inspector::client' do end let (:platform_params) do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :inspector_client_package => 'python3-ironic-inspector-client' } when 'RedHat' diff --git a/spec/classes/ironic_inspector_db_spec.rb b/spec/classes/ironic_inspector_db_spec.rb index 4708f22b..ce372e27 100644 --- a/spec/classes/ironic_inspector_db_spec.rb +++ b/spec/classes/ironic_inspector_db_spec.rb @@ -53,10 +53,7 @@ describe 'ironic::inspector::db' do }).each do |os,facts| context "on #{os}" do let (:facts) do - facts.merge!(OSDefaults.get_facts({ - :concat_basedir => '/var/lib/puppet/concat', - :fqdn => 'some.host.tld', - })) + facts.merge!(OSDefaults.get_facts()) end it_behaves_like 'ironic::inspector::db' diff --git a/spec/classes/ironic_inspector_spec.rb b/spec/classes/ironic_inspector_spec.rb index 8ce185a6..33611824 100644 --- a/spec/classes/ironic_inspector_spec.rb +++ b/spec/classes/ironic_inspector_spec.rb @@ -379,14 +379,11 @@ describe 'ironic::inspector' do }).each do |os,facts| context "on #{os}" do let (:facts) do - facts.merge!(OSDefaults.get_facts({ - :concat_basedir => '/var/lib/puppet/concat', - :fqdn => 'some.host.tld', - })) + facts.merge!(OSDefaults.get_facts()) end let :platform_params do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :inspector_package => 'ironic-inspector', :inspector_service => 'ironic-inspector' } diff --git a/spec/classes/ironic_pxe_spec.rb b/spec/classes/ironic_pxe_spec.rb index 3f32af02..9fc1db6a 100644 --- a/spec/classes/ironic_pxe_spec.rb +++ b/spec/classes/ironic_pxe_spec.rb @@ -366,7 +366,7 @@ describe 'ironic::pxe' do end let(:platform_params) do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :grub_efi_package => 'grub-efi-amd64-signed', @@ -393,11 +393,11 @@ describe 'ironic::pxe' do it_behaves_like 'ironic pxe' - if facts[:osfamily] == 'RedHat' + if facts[:os]['family'] == 'RedHat' it_behaves_like 'ironic pxe without xinetd' end - if facts[:osfamily] == 'Debian' + if facts[:os]['family'] == 'Debian' it_behaves_like 'ironic pxe with xinetd' it_behaves_like 'ironic pxe with pxelinux package' end diff --git a/spec/classes/ironic_wsgi_apache_spec.rb b/spec/classes/ironic_wsgi_apache_spec.rb index e2653c71..a09b11d2 100644 --- a/spec/classes/ironic_wsgi_apache_spec.rb +++ b/spec/classes/ironic_wsgi_apache_spec.rb @@ -10,7 +10,7 @@ describe 'ironic::wsgi::apache' do :group => 'ironic', :path => '/', :priority => 10, - :servername => facts[:fqdn], + :servername => 'foo.example.com', :ssl => false, :threads => 15, :user => 'ironic', @@ -147,14 +147,12 @@ describe 'ironic::wsgi::apache' do context "on #{os}" do let (:facts) do facts.merge(OSDefaults.get_facts({ - :os_workers => 8, - :concat_basedir => '/var/lib/puppet/concat', - :fqdn => 'some.host.tld' + :os_workers => 8, })) end let :platform_params do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :wsgi_script_path => '/usr/lib/cgi-bin/ironic',