diff --git a/manifests/agent.pp b/manifests/agent.pp index b1465653..1f0bcd66 100644 --- a/manifests/agent.pp +++ b/manifests/agent.pp @@ -27,15 +27,15 @@ # # [*workers*] # (optional) Number of agent worker process to spawn -# Defaults to $::os_workers +# Defaults to $facts['os_workers'] # # [*threads*] # (optional) Number of agent greenthreads to spawn -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*listen*] # (optional) Agent host:port pairs to listen on. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class designate::agent ( $package_ensure = present, @@ -43,9 +43,9 @@ class designate::agent ( $enabled = true, $manage_service = true, $backend_driver = 'bind9', - $workers = $::os_workers, - $threads = $::os_service_default, - $listen = $::os_service_default, + $workers = $facts['os_workers'], + $threads = $facts['os_service_default'], + $listen = $facts['os_service_default'], ) inherits designate::params { include designate::deps diff --git a/manifests/agent/bind9.pp b/manifests/agent/bind9.pp index 3a534fb8..1c769343 100644 --- a/manifests/agent/bind9.pp +++ b/manifests/agent/bind9.pp @@ -7,7 +7,7 @@ # # [*rndc_host*] # (Optional) RNDC Host -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*rndc_port*] # (Optional) RNDC Port. @@ -23,24 +23,24 @@ # # [*rndc_timeout*] # (Optional) RNDC command timeout. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*zone_file_path*] # (Optional) Path where zone files are stored. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*query_destination*] # (Optional) Host to query when finding zones. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # class designate::agent::bind9 ( - $rndc_host = $::os_service_default, - $rndc_port = $::os_service_default, + $rndc_host = $facts['os_service_default'], + $rndc_port = $facts['os_service_default'], $rndc_config_file = '/etc/rndc.conf', $rndc_key_file = '/etc/rndc.key', - $rndc_timeout = $::os_service_default, - $zone_file_path = $::os_service_default, - $query_destination = $::os_service_default, + $rndc_timeout = $facts['os_service_default'], + $zone_file_path = $facts['os_service_default'], + $query_destination = $facts['os_service_default'], ) { include designate::deps diff --git a/manifests/api.pp b/manifests/api.pp index 67f1bf27..b07fc2a6 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -23,76 +23,76 @@ # [*auth_strategy*] # (optional) Authentication strategy to use, can be either "noauth" or # "keystone". -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*enable_api_v2*] # (optional) Enable Designate API Version 2. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*enable_api_admin*] # (optional) Enable Designate Admin API. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*api_base_uri*] # Set the base URI of the Designate API service. # # [*listen*] # (optional) API host:port pairs to listen on. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*workers*] # (optional) Number of api worker processes to spawn. -# Defaults to $::os_workers +# Defaults to $facts['os_workers'] # # [*threads*] # (optional) Number of api greenthreads to spawn. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*enable_host_header*] # (optional) Enable host request headers. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*max_header_line*] # (optional) Maximum line size of message headers to be accepted. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_limit_admin*] # (optional) Default per-page limit for the Admin API. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*max_limit_admin*] # (optional) Max page size in the Admin API. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_limit_v2*] # (optional) Default per-page limit for the V2 API. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*max_limit_v2*] # (optional) Max page size in the V2 API. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*pecan_debug*] # (optional) Show the pecan HTML based debug interface (v2 only). -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*enabled_extensions_v2*] # (optional) API Version 2 extensions. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*enabled_extensions_admin*] # (optional) Admin API extensions. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*quotas_verify_project_id*] # (Optional) Verify that the requested Project ID for quota target is # a valid project in Keystone. -# 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']. # # [*service_name*] # (Optional) Name of the service that will be providing the server @@ -106,24 +106,24 @@ class designate::api ( $api_package_name = $::designate::params::api_package_name, $enabled = true, $manage_service = true, - $auth_strategy = $::os_service_default, - $enable_api_v2 = $::os_service_default, - $enable_api_admin = $::os_service_default, - $api_base_uri = $::os_service_default, - $listen = $::os_service_default, - $workers = $::os_workers, - $threads = $::os_service_default, - $enable_host_header = $::os_service_default, - $max_header_line = $::os_service_default, - $default_limit_admin = $::os_service_default, - $max_limit_admin = $::os_service_default, - $default_limit_v2 = $::os_service_default, - $max_limit_v2 = $::os_service_default, - $pecan_debug = $::os_service_default, - $enabled_extensions_v2 = $::os_service_default, - $enabled_extensions_admin = $::os_service_default, - $quotas_verify_project_id = $::os_service_default, - $enable_proxy_headers_parsing = $::os_service_default, + $auth_strategy = $facts['os_service_default'], + $enable_api_v2 = $facts['os_service_default'], + $enable_api_admin = $facts['os_service_default'], + $api_base_uri = $facts['os_service_default'], + $listen = $facts['os_service_default'], + $workers = $facts['os_workers'], + $threads = $facts['os_service_default'], + $enable_host_header = $facts['os_service_default'], + $max_header_line = $facts['os_service_default'], + $default_limit_admin = $facts['os_service_default'], + $max_limit_admin = $facts['os_service_default'], + $default_limit_v2 = $facts['os_service_default'], + $max_limit_v2 = $facts['os_service_default'], + $pecan_debug = $facts['os_service_default'], + $enabled_extensions_v2 = $facts['os_service_default'], + $enabled_extensions_admin = $facts['os_service_default'], + $quotas_verify_project_id = $facts['os_service_default'], + $enable_proxy_headers_parsing = $facts['os_service_default'], $service_name = $::designate::params::api_service_name, ) inherits designate { diff --git a/manifests/central.pp b/manifests/central.pp index add7143b..cf4bca1b 100644 --- a/manifests/central.pp +++ b/manifests/central.pp @@ -26,36 +26,36 @@ # # [*managed_resource_tenant_id*] # (optional) Tenant ID to own all managed resources - like auto-created records etc. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*max_zone_name_len*] # (optional) Maximum zone name length. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*max_recordset_name_len*] # (optional) Maximum record name length. # warning('The max_record_name_len parameter is deprecated, use max_recordset_name_len instead.') -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*min_ttl*] # (optional) Minimum TTL. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*workers*] # (optional) Number of central worker processes to spawn. -# Defaults to $::os_workers +# Defaults to $facts['os_workers'] # # [*threads*] # (optional) Number of central greenthreads to spawn. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_pool_id*] # (optional) The name of the default pool. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*scheduler_filters*] # (optional) Enabled pool scheduling filters. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class designate::central ( $package_ensure = present, @@ -63,14 +63,14 @@ class designate::central ( $enabled = true, $manage_service = true, $managed_resource_email = 'hostmaster@example.com', - $managed_resource_tenant_id = $::os_service_default, - $max_zone_name_len = $::os_service_default, - $max_recordset_name_len = $::os_service_default, - $min_ttl = $::os_service_default, - $workers = $::os_workers, - $threads = $::os_service_default, - $default_pool_id = $::os_service_default, - $scheduler_filters = $::os_service_default, + $managed_resource_tenant_id = $facts['os_service_default'], + $max_zone_name_len = $facts['os_service_default'], + $max_recordset_name_len = $facts['os_service_default'], + $min_ttl = $facts['os_service_default'], + $workers = $facts['os_workers'], + $threads = $facts['os_service_default'], + $default_pool_id = $facts['os_service_default'], + $scheduler_filters = $facts['os_service_default'], ) inherits designate::params { include designate::deps diff --git a/manifests/coordination.pp b/manifests/coordination.pp index 61556305..08b38d78 100644 --- a/manifests/coordination.pp +++ b/manifests/coordination.pp @@ -6,22 +6,22 @@ # # [*backend_url*] # (Optional) Coordination backend URL. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*heartbeat_interval*] # (Optional) Number of seconds between heartbeats for distributed # coordination. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*run_watchers_interval*] # (Optional) Number of seconds between checks to see if group membership # has changed. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class designate::coordination ( - $backend_url = $::os_service_default, - $heartbeat_interval = $::os_service_default, - $run_watchers_interval = $::os_service_default, + $backend_url = $facts['os_service_default'], + $heartbeat_interval = $facts['os_service_default'], + $run_watchers_interval = $facts['os_service_default'], ) { include designate::deps diff --git a/manifests/cors.pp b/manifests/cors.pp index 989c5bcb..b78a6a6e 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 designate::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 designate::deps diff --git a/manifests/db.pp b/manifests/db.pp index ed0dc111..88bc550e 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -10,7 +10,7 @@ # [*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_connection*] # Url used to connect to database. @@ -18,7 +18,7 @@ # # [*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_pool_size*] # Maximum number of SQL connections to keep open in a pool. @@ -39,27 +39,27 @@ # # [*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'] # # [*sync_db*] # (Optional) Run db sync on nodes after connection setting has been set. # Defaults to true # class designate::db ( - $database_db_max_retries = $::os_service_default, + $database_db_max_retries = $facts['os_service_default'], $database_connection = 'mysql://designate:designate@localhost/designate', - $database_max_pool_size = $::os_service_default, - $database_connection_recycle_time = $::os_service_default, - $database_max_retries = $::os_service_default, - $database_retry_interval = $::os_service_default, - $database_max_overflow = $::os_service_default, - $database_pool_timeout = $::os_service_default, - $mysql_enable_ndb = $::os_service_default, + $database_max_pool_size = $facts['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_overflow = $facts['os_service_default'], + $database_pool_timeout = $facts['os_service_default'], + $mysql_enable_ndb = $facts['os_service_default'], $sync_db = true, ) { diff --git a/manifests/healthcheck.pp b/manifests/healthcheck.pp index 09ad3334..523fab3f 100644 --- a/manifests/healthcheck.pp +++ b/manifests/healthcheck.pp @@ -6,28 +6,28 @@ # # [*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 designate::healthcheck ( - $detailed = $::os_service_default, - $backends = $::os_service_default, - $disable_by_file_path = $::os_service_default, - $disable_by_file_paths = $::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 designate::deps diff --git a/manifests/init.pp b/manifests/init.pp index 64603003..c82221ee 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -14,7 +14,7 @@ # # [*host*] # (Optional) Name of this node. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*root_helper*] # (optional) Command for designate rootwrap helper. @@ -28,31 +28,31 @@ # (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'] # # [*rpc_response_timeout*] # (Optional) Seconds to wait for a response from a call. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*control_exchange*] # (Optional) The default exchange under which topics are scoped. May be # overridden by an exchange name specified in the transport_url # option. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*notification_transport_url*] # (optional) Connection url for oslo messaging notification backend. An # example rabbit url would be, rabbit://user:pass@host:port/virtual_host -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*rabbit_use_ssl*] # (optional) Connect over SSL for RabbitMQ -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*rabbit_ha_queues*] # (optional) Use HA queues in RabbitMQ (x-ha-policy: all). If you change this # option, you must wipe the RabbitMQ database. (boolean value). -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*rabbit_heartbeat_in_pthread*] # (Optional) EXPERIMENTAL: Run the health check heartbeat thread @@ -62,36 +62,36 @@ # 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). -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*kombu_ssl_certfile*] # (optional) SSL cert file (valid only if SSL enabled). -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*kombu_ssl_keyfile*] # (optional) SSL key file (valid only if SSL enabled). -# 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. -# 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. -# 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'] # # [*notification_driver*] # (optional) Driver used for issuing notifications @@ -99,7 +99,7 @@ # # [*notification_topics*] # (optional) Notification Topics -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*purge_config*] # (optional) Whether to set only the specified config options @@ -108,41 +108,41 @@ # # [*amqp_durable_queues*] # (optional) Whether to use durable queues in AMQP. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*default_ttl*] # (Optional) TTL Value. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*supported_record_type*] # (Optional) Supported record types. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # class designate( $package_ensure = present, $common_package_name = $::designate::params::common_package_name, - $host = $::os_service_default, + $host = $facts['os_service_default'], $root_helper = 'sudo designate-rootwrap /etc/designate/rootwrap.conf', $state_path = $::designate::params::state_path, - $notification_transport_url = $::os_service_default, - $rabbit_use_ssl = $::os_service_default, - $rabbit_ha_queues = $::os_service_default, - $rabbit_heartbeat_in_pthread = $::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, + $notification_transport_url = $facts['os_service_default'], + $rabbit_use_ssl = $facts['os_service_default'], + $rabbit_ha_queues = $facts['os_service_default'], + $rabbit_heartbeat_in_pthread = $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'], $notification_driver = 'messaging', - $default_transport_url = $::os_service_default, - $rpc_response_timeout = $::os_service_default, - $control_exchange = $::os_service_default, - $notification_topics = $::os_service_default, + $default_transport_url = $facts['os_service_default'], + $rpc_response_timeout = $facts['os_service_default'], + $control_exchange = $facts['os_service_default'], + $notification_topics = $facts['os_service_default'], $purge_config = false, - $amqp_durable_queues = $::os_service_default, - $default_ttl = $::os_service_default, - $supported_record_type = $::os_service_default, + $amqp_durable_queues = $facts['os_service_default'], + $default_ttl = $facts['os_service_default'], + $supported_record_type = $facts['os_service_default'], ) inherits designate::params { include designate::deps diff --git a/manifests/keystone.pp b/manifests/keystone.pp index ce95fcb9..fb228c7e 100644 --- a/manifests/keystone.pp +++ b/manifests/keystone.pp @@ -6,55 +6,55 @@ # # [*timeout*] # (Optional) Timeout value for connecting to keystone in seconds. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*service_type*] # (Optional) The default service_type for endpoint URL discovery. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*valid_interfaces*] # (Optional) List of interfaces, in order of preference for endpoint URL. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*endpoint_override*] # (Optional) Always use this 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 keystone in admin context # through the OpenStack Identity service. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*connect_retries*] # (Optional) The maximum number o retries that should be attempted for # connection errors. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*connect_retry_delay*] # (Optional) Delay (in seconds) between two retries that should be attempted # for connection errors. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*status_code_retries*] # (Optional) The maximum number of retries that should be attempted for # retriable HTTP status codes. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*status_code_retry_delay*] # (Optional) Delay (in seconds) between two retries for retriable status # codes. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class designate::keystone ( - $timeout = $::os_service_default, - $service_type = $::os_service_default, - $valid_interfaces = $::os_service_default, - $endpoint_override = $::os_service_default, - $region_name = $::os_service_default, - $connect_retries = $::os_service_default, - $connect_retry_delay = $::os_service_default, - $status_code_retries = $::os_service_default, - $status_code_retry_delay = $::os_service_default, + $timeout = $facts['os_service_default'], + $service_type = $facts['os_service_default'], + $valid_interfaces = $facts['os_service_default'], + $endpoint_override = $facts['os_service_default'], + $region_name = $facts['os_service_default'], + $connect_retries = $facts['os_service_default'], + $connect_retry_delay = $facts['os_service_default'], + $status_code_retries = $facts['os_service_default'], + $status_code_retry_delay = $facts['os_service_default'], ) { include designate::deps diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 02f45c02..77dfac44 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/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,60 +81,60 @@ # 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 @@ -144,17 +144,17 @@ # 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. @@ -162,13 +162,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. @@ -178,23 +178,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 @@ -202,42 +202,42 @@ # class designate::keystone::authtoken( $username = 'designate', - $password = $::os_service_default, + $password = $facts['os_service_default'], $auth_url = 'http://localhost: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://localhost: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/logging.pp b/manifests/logging.pp index 8ba23e30..136d96e3 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 $::designate::params::log_dir # # [*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 designate::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 = $::designate::params::log_dir, - $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'], ) inherits designate::params { include designate::deps diff --git a/manifests/mdns.pp b/manifests/mdns.pp index 31733757..da423deb 100644 --- a/manifests/mdns.pp +++ b/manifests/mdns.pp @@ -22,64 +22,64 @@ # # [*workers*] # (Optional) Number of mdns worker processes to spawn. -# Defaults to $::os_workers. +# Defaults to $facts['os_workers']. # # [*threads*] # (Optional) Number of mdns greenthreads to spawn. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*tcp_backlog*] # (Optional) mDNS TCP Backlog. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*tcp_recv_timeout*] # (Optional) mDNS TCP Receive Timeout. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*all_tcp*] # (Optional) Send all traffic over TCP. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*query_enforce_tsig*] # (Optional) Enforce all incoming queries (including AXFR) are TSIG signed. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*storage_driver*] # (Optional) The storage driver to use. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*max_message_size*] # (Optional) Maximum message size to emit. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*listen*] # (Optional) mDNS host:port pairs to listen on. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*topic*] # (Optional) RPC topic name for mdns. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*xfr_timeout*] # (Optional) Timeout in seconds for XFR's. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # class designate::mdns ( $package_ensure = present, $mdns_package_name = $::designate::params::mdns_package_name, $enabled = true, $manage_service = true, - $workers = $::os_workers, - $threads = $::os_service_default, - $tcp_backlog = $::os_service_default, - $tcp_recv_timeout = $::os_service_default, - $all_tcp = $::os_service_default, - $query_enforce_tsig = $::os_service_default, - $storage_driver = $::os_service_default, - $max_message_size = $::os_service_default, - $listen = $::os_service_default, - $topic = $::os_service_default, - $xfr_timeout = $::os_service_default, + $workers = $facts['os_workers'], + $threads = $facts['os_service_default'], + $tcp_backlog = $facts['os_service_default'], + $tcp_recv_timeout = $facts['os_service_default'], + $all_tcp = $facts['os_service_default'], + $query_enforce_tsig = $facts['os_service_default'], + $storage_driver = $facts['os_service_default'], + $max_message_size = $facts['os_service_default'], + $listen = $facts['os_service_default'], + $topic = $facts['os_service_default'], + $xfr_timeout = $facts['os_service_default'], ) inherits designate::params { include designate::deps diff --git a/manifests/network_api/neutron.pp b/manifests/network_api/neutron.pp index d2956557..d7b8cec5 100644 --- a/manifests/network_api/neutron.pp +++ b/manifests/network_api/neutron.pp @@ -6,20 +6,20 @@ # # [*endpoints*] # (Optional) URL to use. Format: | -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*endpoint_type*] # (Optional) Endpoint type to use -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*timeout*] # (Optional) Timeout value for connecting to neutron in seconds. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # class designate::network_api::neutron ( - $endpoints = $::os_service_default, - $endpoint_type = $::os_service_default, - $timeout = $::os_service_default, + $endpoints = $facts['os_service_default'], + $endpoint_type = $facts['os_service_default'], + $timeout = $facts['os_service_default'], ) { include designate::deps include designate::params diff --git a/manifests/params.pp b/manifests/params.pp index e764462d..3c3bd0e4 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -18,7 +18,7 @@ class designate::params { $group = 'designate' $user = 'designate' - case $::osfamily { + case $facts['os']['family'] { 'RedHat': { # package name $common_package_name = 'openstack-designate-common' @@ -46,7 +46,7 @@ class designate::params { $designate_wsgi_script_source = '/usr/bin/designate-api-wsgi' } default: { - fail("Unsupported osfamily: ${::osfamily} operatingsystem") + fail("Unsupported osfamily: ${facts['os']['family']}") } } } diff --git a/manifests/policy.pp b/manifests/policy.pp index 2c21bd0c..530c818d 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 designate @@ -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 designate 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 designate::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/designate/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/producer.pp b/manifests/producer.pp index 22476a1c..cc0869b1 100644 --- a/manifests/producer.pp +++ b/manifests/producer.pp @@ -22,24 +22,24 @@ # # [*workers*] # (optional) Number of workers to spawn. -# Defaults to $::os_workers. +# Defaults to $facts['os_workers']. # # [*threads*] # (optional) Number of greenthreads to spawn -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # # [*enabled_tasks*] # (optional) List of tasks to enable, the default enables all tasks. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # class designate::producer ( $package_ensure = 'present', $package_name = $::designate::params::producer_package_name, $enabled = true, $manage_service = true, - $workers = $::os_workers, - $threads = $::os_service_default, - $enabled_tasks = $::os_service_default, + $workers = $facts['os_workers'], + $threads = $facts['os_service_default'], + $enabled_tasks = $facts['os_service_default'], ) inherits designate::params { designate_config { diff --git a/manifests/producer_task/delayed_notify.pp b/manifests/producer_task/delayed_notify.pp index ce7ba5aa..3cbdfd57 100644 --- a/manifests/producer_task/delayed_notify.pp +++ b/manifests/producer_task/delayed_notify.pp @@ -6,20 +6,20 @@ # # [*interval*] # (optional) Run interval in seconds. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*per_page*] # (optional) Default amount of results returned per page. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*batch_size*] # (optional) How many zones to receive NOTIFY on each run. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class designate::producer_task::delayed_notify ( - $interval = $::os_service_default, - $per_page = $::os_service_default, - $batch_size = $::os_service_default, + $interval = $facts['os_service_default'], + $per_page = $facts['os_service_default'], + $batch_size = $facts['os_service_default'], ) { include designate::deps diff --git a/manifests/producer_task/periodic_exists.pp b/manifests/producer_task/periodic_exists.pp index 3ac657fc..b6e116ac 100644 --- a/manifests/producer_task/periodic_exists.pp +++ b/manifests/producer_task/periodic_exists.pp @@ -6,15 +6,15 @@ # # [*interval*] # (optional) Run interval in seconds. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*per_page*] # (optional) Default amount of results returned per page. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class designate::producer_task::periodic_exists ( - $interval = $::os_service_default, - $per_page = $::os_service_default, + $interval = $facts['os_service_default'], + $per_page = $facts['os_service_default'], ) { include designate::deps diff --git a/manifests/producer_task/periodic_secondary_refresh.pp b/manifests/producer_task/periodic_secondary_refresh.pp index 8d968baf..a8e336e6 100644 --- a/manifests/producer_task/periodic_secondary_refresh.pp +++ b/manifests/producer_task/periodic_secondary_refresh.pp @@ -6,15 +6,15 @@ # # [*interval*] # (optional) Run interval in seconds. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*per_page*] # (optional) Default amount of results returned per page. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class designate::producer_task::periodic_secondary_refresh ( - $interval = $::os_service_default, - $per_page = $::os_service_default, + $interval = $facts['os_service_default'], + $per_page = $facts['os_service_default'], ) { include designate::deps diff --git a/manifests/producer_task/worker_periodic_recovery.pp b/manifests/producer_task/worker_periodic_recovery.pp index a8d05a97..c7b230e4 100644 --- a/manifests/producer_task/worker_periodic_recovery.pp +++ b/manifests/producer_task/worker_periodic_recovery.pp @@ -6,15 +6,15 @@ # # [*interval*] # (optional) Run interval in seconds. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*per_page*] # (optional) Default amount of results returned per page. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class designate::producer_task::worker_periodic_recovery ( - $interval = $::os_service_default, - $per_page = $::os_service_default, + $interval = $facts['os_service_default'], + $per_page = $facts['os_service_default'], ) { include designate::deps diff --git a/manifests/producer_task/zone_purge.pp b/manifests/producer_task/zone_purge.pp index 47933f37..5436f592 100644 --- a/manifests/producer_task/zone_purge.pp +++ b/manifests/producer_task/zone_purge.pp @@ -6,26 +6,26 @@ # # [*interval*] # (optional) Run interval in seconds. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*per_page*] # (optional) Default amount of results returned per page. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*time_threshold*] # (optional) How old deleted zones should be (deleted_at) to be purged, in # seconds. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*batch_size*] # (optional) How many zones to receive NOTIFY on each run. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class designate::producer_task::zone_purge ( - $interval = $::os_service_default, - $per_page = $::os_service_default, - $time_threshold = $::os_service_default, - $batch_size = $::os_service_default, + $interval = $facts['os_service_default'], + $per_page = $facts['os_service_default'], + $time_threshold = $facts['os_service_default'], + $batch_size = $facts['os_service_default'], ) { include designate::deps diff --git a/manifests/quota.pp b/manifests/quota.pp index 734b200e..4255cee2 100644 --- a/manifests/quota.pp +++ b/manifests/quota.pp @@ -6,35 +6,35 @@ # # [*quota_api_export_size*] # (optional) size of api export -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*quota_zone_records*] # (optional) records per zone -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*quota_zone_recordsets*] # (optional) recordsets per zone -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*quota_zones*] # (optional) zones per project -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*quota_driver*] # (optional) storage driver to use -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*quota_recordset_records*] # (optional) recordsets per record -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class designate::quota ( - $quota_api_export_size = $::os_service_default, - $quota_zone_records = $::os_service_default, - $quota_zone_recordsets = $::os_service_default, - $quota_zones = $::os_service_default, - $quota_driver = $::os_service_default, - $quota_recordset_records = $::os_service_default, + $quota_api_export_size = $facts['os_service_default'], + $quota_zone_records = $facts['os_service_default'], + $quota_zone_recordsets = $facts['os_service_default'], + $quota_zones = $facts['os_service_default'], + $quota_driver = $facts['os_service_default'], + $quota_recordset_records = $facts['os_service_default'], ) { include designate::deps diff --git a/manifests/sink.pp b/manifests/sink.pp index aee33f11..765c889d 100644 --- a/manifests/sink.pp +++ b/manifests/sink.pp @@ -22,26 +22,26 @@ # # [*workers*] # (optional) Number of sink worker processes to spawn. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*threads*] # (optional) Number of sink greenthreads to spawn. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*enabled_notification_handlers*] # (optional) List of notification handlers to enable, configuration of # these needs to correspond to a [handler:my_driver] section below or # else in the config. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class designate::sink ( $package_ensure = present, $sink_package_name = $::designate::params::sink_package_name, $enabled = true, $manage_service = true, - $workers = $::os_service_default, - $threads = $::os_service_default, - $enabled_notification_handlers = $::os_service_default, + $workers = $facts['os_service_default'], + $threads = $facts['os_service_default'], + $enabled_notification_handlers = $facts['os_service_default'], ) inherits designate::params { include designate::deps diff --git a/manifests/worker.pp b/manifests/worker.pp index 60781903..40f508a0 100644 --- a/manifests/worker.pp +++ b/manifests/worker.pp @@ -22,54 +22,54 @@ # # [*workers*] # (optional) Number of worker processes. -# Defaults to $::os_workers +# Defaults to $facts['os_workers'] # # [*threads*] # (optional) Number of Pool Manager greenthreads to spawn -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*threshold_percentage*] # (optional) Threshold percentage. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*poll_timeout*] # (optional) Poll timeout. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*poll_retry_interval*] # (optional) Poll retry interval. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*poll_max_retries*] # (optional) Poll max retries. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*poll_delay*] # (optional) Poll delay. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*export_synchronous*] # (optional) Whether to allow synchronous zone exports. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*topic*] # (optional) RPC topic for worker component. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class designate::worker( $package_ensure = present, $worker_package_name = $::designate::params::worker_package_name, $enabled = true, $manage_service = true, - $workers = $::os_workers, - $threads = $::os_service_default, - $threshold_percentage = $::os_service_default, - $poll_timeout = $::os_service_default, - $poll_retry_interval = $::os_service_default, - $poll_max_retries = $::os_service_default, - $poll_delay = $::os_service_default, - $export_synchronous = $::os_service_default, - $topic = $::os_service_default, + $workers = $facts['os_workers'], + $threads = $facts['os_service_default'], + $threshold_percentage = $facts['os_service_default'], + $poll_timeout = $facts['os_service_default'], + $poll_retry_interval = $facts['os_service_default'], + $poll_max_retries = $facts['os_service_default'], + $poll_delay = $facts['os_service_default'], + $export_synchronous = $facts['os_service_default'], + $topic = $facts['os_service_default'], ) inherits designate::params { include designate::deps diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index 904f4e8b..fe3da3eb 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -21,7 +21,7 @@ # # [*servername*] # (Optional) The servername for the virtualhost. -# Defaults to $::fqdn +# Defaults to $facts['networking']['fqdn'] # # [*port*] # (Optional) The port. @@ -41,7 +41,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. @@ -122,12 +122,12 @@ # class { 'designate::wsgi::apache': } # class designate::wsgi::apache ( - $servername = $::fqdn, + $servername = $facts['networking']['fqdn'], $port = 9001, $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/manifests/wsgi/uwsgi.pp b/manifests/wsgi/uwsgi.pp index 6ff78ca5..9e57cb39 100644 --- a/manifests/wsgi/uwsgi.pp +++ b/manifests/wsgi/uwsgi.pp @@ -11,7 +11,7 @@ # # [*processes*] # (Optional) Number of processes. -# Defaults to $::os_workers. +# Defaults to $facts['os_workers']. # # [*threads*] # (Optional) Number of threads. @@ -22,14 +22,14 @@ # Defaults to 100 # class designate::wsgi::uwsgi ( - $processes = $::os_workers, + $processes = $facts['os_workers'], $threads = 32, $listen_queue_size = 100, ){ include designate::deps - if $::operatingsystem != 'Debian' { + if $facts['os']['name'] != 'Debian' { warning('This class is only valid for Debian, as other operating systems are not using uwsgi by default.') } diff --git a/spec/classes/designate_agent_spec.rb b/spec/classes/designate_agent_spec.rb index 93a169d1..ad4161ca 100644 --- a/spec/classes/designate_agent_spec.rb +++ b/spec/classes/designate_agent_spec.rb @@ -82,7 +82,7 @@ describe 'designate::agent' do end let(:platform_params) do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :agent_package_name => 'designate-agent', diff --git a/spec/classes/designate_api_spec.rb b/spec/classes/designate_api_spec.rb index 9224eba6..ad987f8b 100644 --- a/spec/classes/designate_api_spec.rb +++ b/spec/classes/designate_api_spec.rb @@ -180,7 +180,7 @@ describe 'designate::api' do end let(:platform_params) do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :api_package_name => 'designate-api', diff --git a/spec/classes/designate_backend_bind9_spec.rb b/spec/classes/designate_backend_bind9_spec.rb index b7d9f4c1..040d5972 100644 --- a/spec/classes/designate_backend_bind9_spec.rb +++ b/spec/classes/designate_backend_bind9_spec.rb @@ -57,13 +57,11 @@ describe 'designate::backend::bind9' do }).each do |os,facts| context "on #{os}" do let (:facts) do - facts.merge!(OSDefaults.get_facts({ - :concat_basedir => '/var/lib/puppet/concat', - })) + facts.merge!(OSDefaults.get_facts()) end let(:platform_params) do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :dns_optionspath => '/etc/bind/named.conf.options' diff --git a/spec/classes/designate_central_spec.rb b/spec/classes/designate_central_spec.rb index dd851130..aa7ccf72 100644 --- a/spec/classes/designate_central_spec.rb +++ b/spec/classes/designate_central_spec.rb @@ -83,7 +83,7 @@ describe 'designate::central' do end let(:platform_params) do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :central_package_name => 'designate-central', diff --git a/spec/classes/designate_client_spec.rb b/spec/classes/designate_client_spec.rb index ba4307ca..0631b5e9 100644 --- a/spec/classes/designate_client_spec.rb +++ b/spec/classes/designate_client_spec.rb @@ -49,7 +49,7 @@ describe 'designate::client' do end let(:platform_params) do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :client_package_name => 'python3-designateclient' } when 'RedHat' diff --git a/spec/classes/designate_init_spec.rb b/spec/classes/designate_init_spec.rb index 6aa8e1ec..dcea800a 100644 --- a/spec/classes/designate_init_spec.rb +++ b/spec/classes/designate_init_spec.rb @@ -173,7 +173,7 @@ describe 'designate' do end let(:platform_params) do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :common_package_name => 'designate-common' } when 'RedHat' diff --git a/spec/classes/designate_mdns_spec.rb b/spec/classes/designate_mdns_spec.rb index 449b570a..79ccb416 100644 --- a/spec/classes/designate_mdns_spec.rb +++ b/spec/classes/designate_mdns_spec.rb @@ -86,7 +86,7 @@ describe 'designate::mdns' do facts.merge!(OSDefaults.get_facts({ :os_workers => 8 })) end let(:platform_params) do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :mdns_package_name => 'designate-mdns', diff --git a/spec/classes/designate_producer_spec.rb b/spec/classes/designate_producer_spec.rb index 9f9cbf89..85a2079e 100644 --- a/spec/classes/designate_producer_spec.rb +++ b/spec/classes/designate_producer_spec.rb @@ -59,7 +59,7 @@ describe 'designate::producer' do end let(:platform_params) do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :producer_package_name => 'designate-producer' } when 'RedHat' diff --git a/spec/classes/designate_sink_spec.rb b/spec/classes/designate_sink_spec.rb index 7d18f039..a54ae634 100644 --- a/spec/classes/designate_sink_spec.rb +++ b/spec/classes/designate_sink_spec.rb @@ -93,7 +93,7 @@ describe 'designate::sink' do end let(:platform_params) do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :sink_package_name => 'designate-sink', diff --git a/spec/classes/designate_worker_spec.rb b/spec/classes/designate_worker_spec.rb index 95d22ed7..ffdd031f 100644 --- a/spec/classes/designate_worker_spec.rb +++ b/spec/classes/designate_worker_spec.rb @@ -100,7 +100,7 @@ describe 'designate::worker' do end let(:platform_params) do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :worker_package_name => 'designate-worker', diff --git a/spec/classes/designate_wsgi_apache_spec.rb b/spec/classes/designate_wsgi_apache_spec.rb index 0e546afd..7853f9b9 100644 --- a/spec/classes/designate_wsgi_apache_spec.rb +++ b/spec/classes/designate_wsgi_apache_spec.rb @@ -10,7 +10,7 @@ describe 'designate::wsgi::apache' do :group => 'designate', :path => '/', :priority => 10, - :servername => facts[:fqdn], + :servername => 'foo.example.com', :ssl => false, :threads => 1, :user => 'designate', @@ -147,14 +147,12 @@ describe 'designate::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/designate',