openstack/puppet-ironic
Code Issues Proposed changes

Merge "Prepare for voxpupuli-puppet-lint-plugins"

Browse Source
This commit is contained in:
Zuul
2025-08-23 04:15:46 +00:00
committed by Gerrit Code Review
parent 1ca1ee2f22 9fd0f46f34
commit b6ac18ca20
66 changed files with 19 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/ironic.pp
View File

@@ -32,7 +32,6 @@ $deploy_kernel = 'glance://deploy_kernel_uuid'
$deploy_ramdisk = 'glance://deploy_ramdisk_uuid'
node 'db' {
class { 'mysql::server':
config_hash => {
'bind_address' => '0.0.0.0',
@@ -48,11 +47,9 @@ node 'db' {
host => $clientcert,
allowed_hosts => ['controller'],
}
}
node 'controller' {
class { 'ironic':
db_password => $db_password,
db_name => $db_name,
@@ -79,5 +76,4 @@ node 'controller' {
deploy_kernel => $deploy_kernel,
deploy_ramdisk => $deploy_ramdisk,
}
}

3
manifests/api.pp
View File

@@ -86,7 +86,6 @@ class ironic::api (
$enable_proxy_headers_parsing = $facts['os_service_default'],
$max_request_body_size = $facts['os_service_default'],
) inherits ironic::params {
include ironic::deps
include ironic::params
include ironic::policy
@@ -126,7 +125,6 @@ class ironic::api (
}
Keystone_endpoint<||> -> Service['ironic-api']
Ironic_api_uwsgi_config<||> ~> Service['ironic-api']
} elsif $service_name == 'httpd' {
service { 'ironic-api':
ensure => 'stopped',
@@ -148,5 +146,4 @@ standalone service, or httpd for being run by a httpd server")
enable_proxy_headers_parsing => $enable_proxy_headers_parsing,
max_request_body_size => $max_request_body_size,
}
}

3
manifests/api/authtoken.pp
View File

@@ -195,7 +195,7 @@
# (Optional) Hash of additional parameters to pass through to the keystone
# authtoken class. Values set here override the individual parameters above.
#
class ironic::api::authtoken(
class ironic::api::authtoken (
String[1] $password,
$username = 'ironic',
$auth_url = 'http://127.0.0.1:5000',
@@ -235,7 +235,6 @@ class ironic::api::authtoken(
$interface = $facts['os_service_default'],
$params = {},
) {
include ironic::deps
keystone::resource::authtoken {

1
manifests/audit.pp
View File

@@ -22,7 +22,6 @@ class ironic::audit (
$audit_map_file = $facts['os_service_default'],
$ignore_req_list = $facts['os_service_default'],
) {
include ironic::deps
ironic_config {

1
manifests/cinder.pp
View File

@@ -64,7 +64,6 @@ class ironic::cinder (
$region_name = $facts['os_service_default'],
$endpoint_override = $facts['os_service_default'],
) {
include ironic::deps
if is_service_default($system_scope) {

2
manifests/client.pp
View File

@@ -29,7 +29,6 @@
class ironic::client (
$package_ensure = present
) {
include ironic::deps
include ironic::params
@@ -40,5 +39,4 @@ class ironic::client (
}
include openstacklib::openstackclient
}

1
manifests/conductor.pp
View File

@@ -314,7 +314,6 @@ class ironic::conductor (
$max_concurrent_deploy = $facts['os_service_default'],
$max_concurrent_clean = $facts['os_service_default'],
) {
include ironic::deps
include ironic::params

1
manifests/config.pp
View File

@@ -23,7 +23,6 @@
class ironic::config (
Hash $ironic_config = {},
) {
include ironic::deps
create_resources('ironic_config', $ironic_config)

1
manifests/cors.pp
View File

@@ -44,7 +44,6 @@ class ironic::cors (
$allow_methods = $facts['os_service_default'],
$allow_headers = $facts['os_service_default'],
) {
include ironic::deps
oslo::cors { 'ironic_config':

1
manifests/db.pp
View File

@@ -54,7 +54,6 @@ class ironic::db (
$database_pool_timeout = $facts['os_service_default'],
$mysql_enable_ndb = $facts['os_service_default'],
) {
include ironic::deps
oslo::db { 'ironic_config':

1
manifests/db/mysql.pp
View File

@@ -53,7 +53,6 @@ class ironic::db::mysql (
$charset = 'utf8',
$collate = 'utf8_general_ci',
) {
include ironic::deps
openstacklib::db::mysql { 'ironic':

3
manifests/db/online_data_migrations.pp
View File

@@ -14,11 +14,10 @@
# ironic-dbsync command.
# Defaults to undef
#
class ironic::db::online_data_migrations(
class ironic::db::online_data_migrations (
$extra_params = undef,
$migration_params = undef,
) {
include ironic::deps
include ironic::params

3
manifests/db/postgresql.pp
View File

@@ -24,14 +24,13 @@
# (Optional) Privileges given to the database user.
# Default to 'ALL'
#
class ironic::db::postgresql(
class ironic::db::postgresql (
$password,
$dbname = 'ironic',
$user = 'ironic',
$encoding = undef,
$privileges = 'ALL',
) {
include ironic::deps
openstacklib::db::postgresql { 'ironic':

3
manifests/db/sync.pp
View File

@@ -12,11 +12,10 @@
# (Optional) Timeout for the execution of the db_sync
# Defaults to 300
#
class ironic::db::sync(
class ironic::db::sync (
$extra_params = undef,
$db_sync_timeout = 300,
) {
include ironic::deps
include ironic::params

2
manifests/disk_utils.pp
View File

@@ -44,7 +44,6 @@ class ironic::disk_utils (
$image_convert_memory_limit = $facts['os_service_default'],
$image_convert_attempts = $facts['os_service_default'],
) {
include ironic::deps
include ironic::params
@@ -57,5 +56,4 @@ class ironic::disk_utils (
'disk_utils/image_convert_memory_limit': value => $image_convert_memory_limit;
'disk_utils/image_convert_attempts': value => $image_convert_attempts;
}
}

1
manifests/drivers/agent.pp
View File

@@ -150,7 +150,6 @@ class ironic::drivers::agent (
$api_ca_file = $facts['os_service_default'],
$allow_md5_checksum = $facts['os_service_default'],
) {
include ironic::deps
# Configure ironic.conf

2
manifests/drivers/ansible.pp
View File

@@ -80,7 +80,6 @@ class ironic::drivers::ansible (
$default_clean_steps_config = $facts['os_service_default'],
$default_python_interpreter = $facts['os_service_default'],
) {
include ironic::deps
include ironic::params
@@ -113,5 +112,4 @@ class ironic::drivers::ansible (
tag => ['openstack', 'ironic-package'],
}
)
}

1
manifests/drivers/drac.pp
View File

@@ -55,7 +55,6 @@ class ironic::drivers::drac (
$bios_factory_reset_timeout = $facts['os_service_default'],
$raid_job_timeout = $facts['os_service_default'],
) {
include ironic::deps
include ironic::params

2
manifests/drivers/hardware_interface.pp
View File

@@ -34,7 +34,6 @@ define ironic::drivers::hardware_interface (
$enabled_list = $facts['os_service_default'],
$default = $facts['os_service_default'],
) {
include ironic::deps
ironic_config {
@@ -42,4 +41,3 @@ define ironic::drivers::hardware_interface (
"DEFAULT/default_${interface_type}_interface": value => $default;
}
}

2
manifests/drivers/ilo.pp
View File

@@ -45,7 +45,6 @@ class ironic::drivers::ilo (
$default_boot_mode = $facts['os_service_default'],
$package_ensure = 'present',
) {
include ironic::deps
include ironic::params
@@ -64,5 +63,4 @@ class ironic::drivers::ilo (
tag => ['openstack', 'ironic-package'],
}
)
}

1
manifests/drivers/inspector.pp
View File

@@ -109,7 +109,6 @@ class ironic::drivers::inspector (
$additional_hooks = undef,
Hash $physical_network_cidr_map = {},
) {
include ironic::deps
if $auth_type {

1
manifests/drivers/interfaces.pp
View File

@@ -172,7 +172,6 @@ class ironic::drivers::interfaces (
$enabled_storage_interfaces = $facts['os_service_default'],
$enabled_vendor_interfaces = $facts['os_service_default'],
) {
$interfaces = {
'bios' => { 'enabled_list' => $enabled_bios_interfaces,
'default' => $default_bios_interface },

2
manifests/drivers/ipmi.pp
View File

@@ -72,7 +72,6 @@ class ironic::drivers::ipmi (
$store_cred_in_env = $facts['os_service_default'],
$cipher_suite_versions = $facts['os_service_default'],
) {
include ironic::deps
# Configure ironic.conf
@@ -87,5 +86,4 @@ class ironic::drivers::ipmi (
'ipmi/store_cred_in_env': value => $store_cred_in_env;
'ipmi/cipher_suite_versions': value => join(any2array($cipher_suite_versions), ',');
}
}

2
manifests/drivers/pxe.pp
View File

@@ -151,7 +151,6 @@ class ironic::drivers::pxe (
$ipxe_bootfile_name_by_arch = $facts['os_service_default'],
$pxe_config_template_by_arch = $facts['os_service_default'],
) inherits ironic::params {
include ironic::deps
include ironic::pxe::common
@@ -206,5 +205,4 @@ class ironic::drivers::pxe (
'pxe/pxe_bootfile_name_by_arch': value => $pxe_bootfile_name_by_arch_real;
'pxe/ipxe_bootfile_name_by_arch': value => $ipxe_bootfile_name_by_arch_real;
}
}

2
manifests/drivers/redfish.pp
View File

@@ -110,7 +110,6 @@ class ironic::drivers::redfish (
$raid_config_fail_interval = $facts['os_service_default'],
$boot_mode_config_timeout = $facts['os_service_default'],
) {
include ironic::deps
include ironic::params
@@ -140,5 +139,4 @@ class ironic::drivers::redfish (
tag => ['openstack', 'ironic-package'],
}
)
}

1
manifests/glance.pp
View File

@@ -118,7 +118,6 @@ class ironic::glance (
$swift_temp_url_duration = $facts['os_service_default'],
$endpoint_override = $facts['os_service_default'],
) {
include ironic::deps
if ($swift_account_project_name and !is_service_default($swift_account)) {

1
manifests/healthcheck.pp
View File

@@ -51,7 +51,6 @@ class ironic::healthcheck (
$disable_by_file_paths = $facts['os_service_default'],
$enable_by_file_paths = $facts['os_service_default'],
) {
include ironic::deps
ironic_config {

5
manifests/init.pp
View File

@@ -302,7 +302,6 @@ class ironic (
# DEPRECATED PARAMETERS
$rabbit_heartbeat_in_pthread = undef,
) {
include ironic::deps
include ironic::db
include ironic::params
@@ -341,14 +340,14 @@ class ironic (
include ironic::db::online_data_migrations
}
oslo::messaging::default {'ironic_config':
oslo::messaging::default { 'ironic_config':
executor_thread_pool_size => $executor_thread_pool_size,
transport_url => $default_transport_url,
rpc_response_timeout => $rpc_response_timeout,
control_exchange => $control_exchange,
}
oslo::messaging::rabbit {'ironic_config':
oslo::messaging::rabbit { 'ironic_config':
rabbit_use_ssl => $rabbit_use_ssl,
heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold,
heartbeat_rate => $rabbit_heartbeat_rate,

6
manifests/inspector.pp
View File

@@ -404,7 +404,6 @@ class ironic::inspector (
# DEPRECATED PARAMETERS
$rabbit_heartbeat_in_pthread = undef,
) inherits ironic::params {
include ironic::deps
include ironic::pxe::common
include ironic::inspector::db
@@ -513,14 +512,14 @@ class ironic::inspector (
'DEFAULT/standalone': value => $standalone;
}
oslo::messaging::default {'ironic_inspector_config':
oslo::messaging::default { 'ironic_inspector_config':
executor_thread_pool_size => $executor_thread_pool_size,
transport_url => $default_transport_url,
rpc_response_timeout => $rpc_response_timeout,
control_exchange => $control_exchange,
}
oslo::messaging::rabbit {'ironic_inspector_config':
oslo::messaging::rabbit { 'ironic_inspector_config':
rabbit_use_ssl => $rabbit_use_ssl,
heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold,
heartbeat_rate => $rabbit_heartbeat_rate,
@@ -613,7 +612,6 @@ class ironic::inspector (
}
Keystone_endpoint<||> -> Service['ironic-inspector']
} else {
# NOTE(tkajinam): Ensure ironic-inspector is stopped before starting
# -api and -conductor.
service { 'ironic-inspector':

3
manifests/inspector/authtoken.pp
View File

@@ -194,7 +194,7 @@
# (Optional) Hash of additional parameters to pass through to the keystone
# authtoken class. Values set here override the individual parameters above.
#
class ironic::inspector::authtoken(
class ironic::inspector::authtoken (
String[1] $password,
$username = 'ironic',
$auth_url = 'http://127.0.0.1:5000',
@@ -234,7 +234,6 @@ class ironic::inspector::authtoken(
$interface = $facts['os_service_default'],
$params = {}
) {
include ironic::deps
if $username == 'ironic' {

2
manifests/inspector/client.pp
View File

@@ -11,7 +11,6 @@
class ironic::inspector::client (
$package_ensure = present
) {
include ironic::deps
include ironic::params
@@ -22,5 +21,4 @@ class ironic::inspector::client (
}
include openstacklib::openstackclient
}

1
manifests/inspector/config.pp
View File

@@ -23,7 +23,6 @@
class ironic::inspector::config (
Hash $ironic_inspector_config = {},
) {
include ironic::deps
create_resources('ironic_inspector_config', $ironic_inspector_config)

3
manifests/inspector/coordination.pp
View File

@@ -11,10 +11,9 @@
class ironic::inspector::coordination (
$backend_url = $facts['os_service_default'],
) {
include ironic::deps
oslo::coordination{ 'ironic_inspector_config':
oslo::coordination { 'ironic_inspector_config':
backend_url => $backend_url,
}

1
manifests/inspector/cors.pp
View File

@@ -44,7 +44,6 @@ class ironic::inspector::cors (
$allow_methods = $facts['os_service_default'],
$allow_headers = $facts['os_service_default'],
) {
include ironic::deps
oslo::cors { 'ironic_inspector_config':

1
manifests/inspector/db.pp
View File

@@ -54,7 +54,6 @@ class ironic::inspector::db (
$database_pool_timeout = $facts['os_service_default'],
$mysql_enable_ndb = $facts['os_service_default'],
) {
include ironic::deps
oslo::db { 'ironic_inspector_config':

1
manifests/inspector/db/mysql.pp
View File

@@ -53,7 +53,6 @@ class ironic::inspector::db::mysql (
$charset = 'utf8',
$collate = 'utf8_general_ci',
) {
include ironic::deps
openstacklib::db::mysql { 'ironic-inspector':

3
manifests/inspector/db/postgresql.pp
View File

@@ -24,14 +24,13 @@
# (Optional) Privileges given to the database user.
# Default to 'ALL'
#
class ironic::inspector::db::postgresql(
class ironic::inspector::db::postgresql (
$password,
$dbname = 'ironic-inspector',
$user = 'ironic-inspector',
$encoding = undef,
$privileges = 'ALL',
) {
include ironic::deps
openstacklib::db::postgresql { 'ironic-inspector':

3
manifests/inspector/db/sync.pp
View File

@@ -7,10 +7,9 @@
# (Optional) Timeout for the execution of the db_sync
# Defaults to 300
#
class ironic::inspector::db::sync(
class ironic::inspector::db::sync (
$db_sync_timeout = 300,
) {
include ironic::deps
include ironic::params

1
manifests/inspector/healthcheck.pp
View File

@@ -51,7 +51,6 @@ class ironic::inspector::healthcheck (
$disable_by_file_paths = $facts['os_service_default'],
$enable_by_file_paths = $facts['os_service_default'],
) {
include ironic::deps
ironic_inspector_config {

1
manifests/inspector/ironic.pp
View File

@@ -74,7 +74,6 @@ class ironic::inspector::ironic (
$max_retries = $facts['os_service_default'],
$retry_interval = $facts['os_service_default'],
) {
if $username == 'ironic' {
warning('The default username will be changed to ironic-inspector in a future release')
}

4
manifests/inspector/logging.pp
View File

@@ -93,7 +93,7 @@
# Defaults to $facts['os_service_default']
# Example: 'Y-%m-%d %H:%M:%S'
#
class ironic::inspector::logging(
class ironic::inspector::logging (
$use_syslog = $facts['os_service_default'],
$use_json = $facts['os_service_default'],
$use_stderr = $facts['os_service_default'],
@@ -113,7 +113,6 @@ class ironic::inspector::logging(
$instance_uuid_format = $facts['os_service_default'],
$log_date_format = $facts['os_service_default'],
) {
include ironic::deps
oslo::log { 'ironic_inspector_config':
@@ -136,5 +135,4 @@ class ironic::inspector::logging(
instance_uuid_format => $instance_uuid_format,
log_date_format => $log_date_format,
}
}

2
manifests/inspector/policy.pp
View File

@@ -54,7 +54,6 @@ class ironic::inspector::policy (
$policy_dirs = $facts['os_service_default'],
Boolean $purge_config = false,
) {
include ironic::deps
include ironic::params
@@ -82,5 +81,4 @@ class ironic::inspector::policy (
policy_default_rule => $policy_default_rule,
policy_dirs => $policy_dirs,
}
}

2
manifests/inspector/pxe_filter.pp
View File

@@ -27,12 +27,10 @@ class ironic::inspector::pxe_filter (
$driver = $facts['os_service_default'],
$sync_period = $facts['os_service_default'],
) {
include ironic::deps
ironic_inspector_config {
'pxe_filter/driver': value => $driver;
'pxe_filter/sync_period': value => $sync_period;
}
}

2
manifests/inspector/pxe_filter/dnsmasq.pp
View File

@@ -35,7 +35,6 @@ class ironic::inspector::pxe_filter::dnsmasq (
$dnsmasq_stop_command = $facts['os_service_default'],
$purge_dhcp_hostsdir = $facts['os_service_default'],
) {
include ironic::deps
include ironic::inspector
@@ -51,5 +50,4 @@ configured properly to use dnsmasq PXE filter.")
'dnsmasq_pxe_filter/dnsmasq_stop_command': value => $dnsmasq_stop_command;
'dnsmasq_pxe_filter/purge_dhcp_hostsdir': value => $purge_dhcp_hostsdir;
}
}

1
manifests/inspector/pxe_filter/iptables.pp
View File

@@ -32,7 +32,6 @@ class ironic::inspector::pxe_filter::iptables (
$ethoib_interfaces = $facts['os_service_default'],
$ip_version = $facts['os_service_default'],
) {
include ironic::deps
include ironic::inspector

1
manifests/inspector/service_catalog.pp
View File

@@ -67,7 +67,6 @@ class ironic::inspector::service_catalog (
$region_name = $facts['os_service_default'],
$endpoint_override = $facts['os_service_default'],
) {
include ironic::deps
if $username == 'ironic' {

1
manifests/inspector/swift.pp
View File

@@ -77,7 +77,6 @@ class ironic::inspector::swift (
$container = $facts['os_service_default'],
$delete_after = $facts['os_service_default'],
) {
if $username == 'ironic' {
warning('The default username will be changed to ironic-inspector in a future release')
}

1
manifests/inspector/wsgi/apache.pp
View File

@@ -152,7 +152,6 @@ class ironic::inspector::wsgi::apache (
$request_headers = undef,
$vhost_custom_fragment = undef,
) {
include ironic::deps
include ironic::params

2
manifests/inventory.pp
View File

@@ -17,7 +17,6 @@ class ironic::inventory (
$data_backend = $facts['os_service_default'],
$swift_data_container = $facts['os_service_default'],
) {
include ironic::deps
include ironic::params
@@ -31,5 +30,4 @@ class ironic::inventory (
'inventory/data_backend': value => $data_backend;
'inventory/swift_data_container': value => $swift_data_container;
}
}

1
manifests/json_rpc.pp
View File

@@ -99,7 +99,6 @@ class ironic::json_rpc (
$endpoint_override = $facts['os_service_default'],
$region_name = $facts['os_service_default'],
) {
include ironic::deps
if is_service_default($system_scope) {

2
manifests/keystone/auth.pp
View File

@@ -123,7 +123,6 @@ class ironic::keystone::auth (
Keystone::EndpointUrl $admin_url = 'http://127.0.0.1:6385',
Keystone::EndpointUrl $internal_url = 'http://127.0.0.1:6385',
) {
include ironic::deps
Keystone::Resource::Service_identity['ironic'] -> Anchor['ironic::service::end']
@@ -148,5 +147,4 @@ class ironic::keystone::auth (
internal_url => $internal_url,
admin_url => $admin_url,
}
}

2
manifests/keystone/auth_inspector.pp
View File

@@ -114,7 +114,6 @@ class ironic::keystone::auth_inspector (
Keystone::EndpointUrl $admin_url = 'http://127.0.0.1:5050',
Keystone::EndpointUrl $internal_url = 'http://127.0.0.1:5050',
) {
include ironic::deps
$real_service_name = pick($service_name, $auth_name)
@@ -141,5 +140,4 @@ class ironic::keystone::auth_inspector (
internal_url => $internal_url,
admin_url => $admin_url,
}
}

4
manifests/logging.pp
View File

@@ -97,7 +97,7 @@
# Defaults to $facts['os_service_default']
# Example: 'Y-%m-%d %H:%M:%S'
#
class ironic::logging(
class ironic::logging (
$use_syslog = $facts['os_service_default'],
$use_json = $facts['os_service_default'],
$use_journal = $facts['os_service_default'],
@@ -118,7 +118,6 @@ class ironic::logging(
$instance_uuid_format = $facts['os_service_default'],
$log_date_format = $facts['os_service_default'],
) {
include ironic::deps
oslo::log { 'ironic_config':
@@ -142,5 +141,4 @@ class ironic::logging(
instance_uuid_format => $instance_uuid_format,
log_date_format => $log_date_format,
}
}

1
manifests/neutron.pp
View File

@@ -79,7 +79,6 @@ class ironic::neutron (
$dhcpv6_stateful_address_count = $facts['os_service_default'],
$fail_on_port_binding_failure = $facts['os_service_default'],
) {
if is_service_default($system_scope) {
$project_name_real = $project_name
$project_domain_name_real = $project_domain_name

1
manifests/nova.pp
View File

@@ -71,7 +71,6 @@ class ironic::nova (
$endpoint_override = $facts['os_service_default'],
Boolean $send_power_notifications = true,
) {
include ironic::deps
ironic_config {

1
manifests/params.pp
View File

@@ -120,5 +120,4 @@ class ironic::params {
fail("Unsupported osfamily: ${facts['os']['family']}")
}
}
}

2
manifests/policy.pp
View File

@@ -54,7 +54,6 @@ class ironic::policy (
$policy_dirs = $facts['os_service_default'],
Boolean $purge_config = false,
) {
include ironic::deps
include ironic::params
@@ -82,5 +81,4 @@ class ironic::policy (
policy_default_rule => $policy_default_rule,
policy_dirs => $policy_dirs,
}
}

1
manifests/pxe.pp
View File

@@ -124,7 +124,6 @@ class ironic::pxe (
Array[String] $vhost_options = ['-Indexes', '+FollowSymLinks'],
Hash $vhost_config = {},
) inherits ironic::params {
include ironic::deps
include ironic::pxe::common

1
manifests/pxe/common.pp
View File

@@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations
# under the License.
# Common setup for Ironic PXE boot
#
# This class allows to globally override configuration for PXE

3
manifests/pxe/tftpboot_file.pp
View File

@@ -35,7 +35,7 @@ define ironic::pxe::tftpboot_file (
include ironic::deps
include ironic::params
file {"${destination_directory}/${file}":
file { "${destination_directory}/${file}":
ensure => 'file',
seltype => 'tftpdir_t',
owner => $ironic::params::user,
@@ -45,4 +45,3 @@ define ironic::pxe::tftpboot_file (
backup => false,
}
}

3
manifests/reports.pp
View File

@@ -25,14 +25,13 @@
# (Optional) Manage oslo.reports package.
# Defaults to true
#
class ironic::reports(
class ironic::reports (
$log_dir = $facts['os_service_default'],
$file_event_handler = $facts['os_service_default'],
$file_event_handler_interval = $facts['os_service_default'],
$package_ensure = 'present',
Boolean $manage_package = true,
) {
include ironic::deps
oslo::reports { 'ironic_config':

1
manifests/service_catalog.pp
View File

@@ -65,7 +65,6 @@ class ironic::service_catalog (
$region_name = $facts['os_service_default'],
$endpoint_override = $facts['os_service_default'],
) {
include ironic::deps
if is_service_default($system_scope) {

1
manifests/swift.pp
View File

@@ -64,7 +64,6 @@ class ironic::swift (
$region_name = $facts['os_service_default'],
$endpoint_override = $facts['os_service_default'],
) {
include ironic::deps
if is_service_default($system_scope) {

3
manifests/vnc.pp
View File

@@ -72,7 +72,7 @@
# (optional) List of available ciphers.
# Defaults to $facts['os_service_default']
#
class ironic::vnc(
class ironic::vnc (
$package_ensure = present,
Boolean $enabled = true,
Boolean $manage_service = true,
@@ -90,7 +90,6 @@ class ironic::vnc(
$ssl_minimum_version = $facts['os_service_default'],
$ssl_ciphers = $facts['os_service_default'],
) inherits ironic::params {
include ironic::deps
ironic_config {

1
manifests/wsgi/apache.pp
View File

@@ -158,7 +158,6 @@ class ironic::wsgi::apache (
$request_headers = undef,
$vhost_custom_fragment = undef,
) {
include ironic::deps
include ironic::params

5
manifests/wsgi/uwsgi.pp
View File

@@ -25,11 +25,10 @@ class ironic::wsgi::uwsgi (
$processes = $facts['os_workers'],
$threads = 32,
$listen_queue_size = 100,
){
) {
include ironic::deps
if $facts['os']['name'] != 'Debian'{
if $facts['os']['name'] != 'Debian' {
warning('This class is only valid for Debian, as other operating systems are not using uwsgi by default.')
}