diff --git a/examples/ironic.pp b/examples/ironic.pp index 8d09cc76..034c2ac8 100644 --- a/examples/ironic.pp +++ b/examples/ironic.pp @@ -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, } - } diff --git a/manifests/api.pp b/manifests/api.pp index c2583aa4..b5316eb7 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -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, } - } diff --git a/manifests/api/authtoken.pp b/manifests/api/authtoken.pp index 31472fd7..049eb2be 100644 --- a/manifests/api/authtoken.pp +++ b/manifests/api/authtoken.pp @@ -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 { diff --git a/manifests/audit.pp b/manifests/audit.pp index 0efeb918..0a89cbf0 100644 --- a/manifests/audit.pp +++ b/manifests/audit.pp @@ -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 { diff --git a/manifests/cinder.pp b/manifests/cinder.pp index 41d472de..1956ab56 100644 --- a/manifests/cinder.pp +++ b/manifests/cinder.pp @@ -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) { diff --git a/manifests/client.pp b/manifests/client.pp index 133af443..ac8cc9f4 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -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 - } diff --git a/manifests/conductor.pp b/manifests/conductor.pp index bc402fcf..f2a78fa8 100644 --- a/manifests/conductor.pp +++ b/manifests/conductor.pp @@ -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 diff --git a/manifests/config.pp b/manifests/config.pp index e39d8711..9ce6e435 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -23,7 +23,6 @@ class ironic::config ( Hash $ironic_config = {}, ) { - include ironic::deps create_resources('ironic_config', $ironic_config) diff --git a/manifests/cors.pp b/manifests/cors.pp index a7270b1c..cc8ddda9 100644 --- a/manifests/cors.pp +++ b/manifests/cors.pp @@ -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': diff --git a/manifests/db.pp b/manifests/db.pp index 10d2f452..900a2ae9 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -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': diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index 090d1b53..15d781b3 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -53,7 +53,6 @@ class ironic::db::mysql ( $charset = 'utf8', $collate = 'utf8_general_ci', ) { - include ironic::deps openstacklib::db::mysql { 'ironic': diff --git a/manifests/db/online_data_migrations.pp b/manifests/db/online_data_migrations.pp index e2c89982..108d24d3 100644 --- a/manifests/db/online_data_migrations.pp +++ b/manifests/db/online_data_migrations.pp @@ -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 diff --git a/manifests/db/postgresql.pp b/manifests/db/postgresql.pp index a3b771a6..7a981814 100644 --- a/manifests/db/postgresql.pp +++ b/manifests/db/postgresql.pp @@ -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': diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp index 7aa76ff9..f3450347 100644 --- a/manifests/db/sync.pp +++ b/manifests/db/sync.pp @@ -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 diff --git a/manifests/disk_utils.pp b/manifests/disk_utils.pp index d2311a7f..afa3bc0b 100644 --- a/manifests/disk_utils.pp +++ b/manifests/disk_utils.pp @@ -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; } - } diff --git a/manifests/drivers/agent.pp b/manifests/drivers/agent.pp index df6c84a9..f91786e1 100644 --- a/manifests/drivers/agent.pp +++ b/manifests/drivers/agent.pp @@ -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 diff --git a/manifests/drivers/ansible.pp b/manifests/drivers/ansible.pp index 51df2d48..44715907 100644 --- a/manifests/drivers/ansible.pp +++ b/manifests/drivers/ansible.pp @@ -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'], } ) - } diff --git a/manifests/drivers/drac.pp b/manifests/drivers/drac.pp index be3c3077..b4746e0b 100644 --- a/manifests/drivers/drac.pp +++ b/manifests/drivers/drac.pp @@ -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 diff --git a/manifests/drivers/hardware_interface.pp b/manifests/drivers/hardware_interface.pp index 8cffc267..02fa7f47 100644 --- a/manifests/drivers/hardware_interface.pp +++ b/manifests/drivers/hardware_interface.pp @@ -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; } } - diff --git a/manifests/drivers/ilo.pp b/manifests/drivers/ilo.pp index 5f93c0fe..39f12649 100644 --- a/manifests/drivers/ilo.pp +++ b/manifests/drivers/ilo.pp @@ -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'], } ) - } diff --git a/manifests/drivers/inspector.pp b/manifests/drivers/inspector.pp index e425fc0e..f74f8b78 100644 --- a/manifests/drivers/inspector.pp +++ b/manifests/drivers/inspector.pp @@ -109,7 +109,6 @@ class ironic::drivers::inspector ( $additional_hooks = undef, Hash $physical_network_cidr_map = {}, ) { - include ironic::deps if $auth_type { diff --git a/manifests/drivers/interfaces.pp b/manifests/drivers/interfaces.pp index a56635a3..046baf79 100644 --- a/manifests/drivers/interfaces.pp +++ b/manifests/drivers/interfaces.pp @@ -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 }, diff --git a/manifests/drivers/ipmi.pp b/manifests/drivers/ipmi.pp index c6b8a06b..fb69c5e6 100644 --- a/manifests/drivers/ipmi.pp +++ b/manifests/drivers/ipmi.pp @@ -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), ','); } - } diff --git a/manifests/drivers/pxe.pp b/manifests/drivers/pxe.pp index 068738c9..53578b5a 100644 --- a/manifests/drivers/pxe.pp +++ b/manifests/drivers/pxe.pp @@ -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; } - } diff --git a/manifests/drivers/redfish.pp b/manifests/drivers/redfish.pp index 9840aa0c..b7e10349 100644 --- a/manifests/drivers/redfish.pp +++ b/manifests/drivers/redfish.pp @@ -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'], } ) - } diff --git a/manifests/glance.pp b/manifests/glance.pp index d966e75b..5553a505 100644 --- a/manifests/glance.pp +++ b/manifests/glance.pp @@ -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)) { diff --git a/manifests/healthcheck.pp b/manifests/healthcheck.pp index 33cef9d6..b5fcedc4 100644 --- a/manifests/healthcheck.pp +++ b/manifests/healthcheck.pp @@ -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 { diff --git a/manifests/init.pp b/manifests/init.pp index 333b306e..8d059fa0 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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, diff --git a/manifests/inspector.pp b/manifests/inspector.pp index d46b807b..4875b9d4 100644 --- a/manifests/inspector.pp +++ b/manifests/inspector.pp @@ -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': diff --git a/manifests/inspector/authtoken.pp b/manifests/inspector/authtoken.pp index 6ab24fcc..dc0842b2 100644 --- a/manifests/inspector/authtoken.pp +++ b/manifests/inspector/authtoken.pp @@ -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' { diff --git a/manifests/inspector/client.pp b/manifests/inspector/client.pp index f11178a7..bcfea43d 100644 --- a/manifests/inspector/client.pp +++ b/manifests/inspector/client.pp @@ -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 - } diff --git a/manifests/inspector/config.pp b/manifests/inspector/config.pp index 3e39582a..7e1a8dc6 100644 --- a/manifests/inspector/config.pp +++ b/manifests/inspector/config.pp @@ -23,7 +23,6 @@ class ironic::inspector::config ( Hash $ironic_inspector_config = {}, ) { - include ironic::deps create_resources('ironic_inspector_config', $ironic_inspector_config) diff --git a/manifests/inspector/coordination.pp b/manifests/inspector/coordination.pp index fa3fa1b9..7bff64a5 100644 --- a/manifests/inspector/coordination.pp +++ b/manifests/inspector/coordination.pp @@ -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, } diff --git a/manifests/inspector/cors.pp b/manifests/inspector/cors.pp index 24fcb71f..777a1d7f 100644 --- a/manifests/inspector/cors.pp +++ b/manifests/inspector/cors.pp @@ -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': diff --git a/manifests/inspector/db.pp b/manifests/inspector/db.pp index 4a1a0a64..5953c917 100644 --- a/manifests/inspector/db.pp +++ b/manifests/inspector/db.pp @@ -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': diff --git a/manifests/inspector/db/mysql.pp b/manifests/inspector/db/mysql.pp index 5b9870f9..250cf02e 100644 --- a/manifests/inspector/db/mysql.pp +++ b/manifests/inspector/db/mysql.pp @@ -53,7 +53,6 @@ class ironic::inspector::db::mysql ( $charset = 'utf8', $collate = 'utf8_general_ci', ) { - include ironic::deps openstacklib::db::mysql { 'ironic-inspector': diff --git a/manifests/inspector/db/postgresql.pp b/manifests/inspector/db/postgresql.pp index 3e71c32f..45487ee4 100644 --- a/manifests/inspector/db/postgresql.pp +++ b/manifests/inspector/db/postgresql.pp @@ -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': diff --git a/manifests/inspector/db/sync.pp b/manifests/inspector/db/sync.pp index f54f004f..dcc994ef 100644 --- a/manifests/inspector/db/sync.pp +++ b/manifests/inspector/db/sync.pp @@ -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 diff --git a/manifests/inspector/healthcheck.pp b/manifests/inspector/healthcheck.pp index a594e968..547d7c74 100644 --- a/manifests/inspector/healthcheck.pp +++ b/manifests/inspector/healthcheck.pp @@ -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 { diff --git a/manifests/inspector/ironic.pp b/manifests/inspector/ironic.pp index 54b697ec..661e9a64 100644 --- a/manifests/inspector/ironic.pp +++ b/manifests/inspector/ironic.pp @@ -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') } diff --git a/manifests/inspector/logging.pp b/manifests/inspector/logging.pp index c71dea03..8b7d08df 100644 --- a/manifests/inspector/logging.pp +++ b/manifests/inspector/logging.pp @@ -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, } - } diff --git a/manifests/inspector/policy.pp b/manifests/inspector/policy.pp index 521dda97..9181e0e2 100644 --- a/manifests/inspector/policy.pp +++ b/manifests/inspector/policy.pp @@ -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, } - } diff --git a/manifests/inspector/pxe_filter.pp b/manifests/inspector/pxe_filter.pp index 0108b9ad..70e08a2c 100644 --- a/manifests/inspector/pxe_filter.pp +++ b/manifests/inspector/pxe_filter.pp @@ -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; } - } diff --git a/manifests/inspector/pxe_filter/dnsmasq.pp b/manifests/inspector/pxe_filter/dnsmasq.pp index 451b8764..146ef81b 100644 --- a/manifests/inspector/pxe_filter/dnsmasq.pp +++ b/manifests/inspector/pxe_filter/dnsmasq.pp @@ -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; } - } diff --git a/manifests/inspector/pxe_filter/iptables.pp b/manifests/inspector/pxe_filter/iptables.pp index 49ee30c8..123ed06c 100644 --- a/manifests/inspector/pxe_filter/iptables.pp +++ b/manifests/inspector/pxe_filter/iptables.pp @@ -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 diff --git a/manifests/inspector/service_catalog.pp b/manifests/inspector/service_catalog.pp index 2860abed..3ed00130 100644 --- a/manifests/inspector/service_catalog.pp +++ b/manifests/inspector/service_catalog.pp @@ -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' { diff --git a/manifests/inspector/swift.pp b/manifests/inspector/swift.pp index ef286b42..4d932b03 100644 --- a/manifests/inspector/swift.pp +++ b/manifests/inspector/swift.pp @@ -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') } diff --git a/manifests/inspector/wsgi/apache.pp b/manifests/inspector/wsgi/apache.pp index 779f32a4..161bdaab 100644 --- a/manifests/inspector/wsgi/apache.pp +++ b/manifests/inspector/wsgi/apache.pp @@ -152,7 +152,6 @@ class ironic::inspector::wsgi::apache ( $request_headers = undef, $vhost_custom_fragment = undef, ) { - include ironic::deps include ironic::params diff --git a/manifests/inventory.pp b/manifests/inventory.pp index 71493a89..81f897ae 100644 --- a/manifests/inventory.pp +++ b/manifests/inventory.pp @@ -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; } - } diff --git a/manifests/json_rpc.pp b/manifests/json_rpc.pp index a28c3f88..75ebfc93 100644 --- a/manifests/json_rpc.pp +++ b/manifests/json_rpc.pp @@ -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) { diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index b10f9da4..742b187f 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -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, } - } diff --git a/manifests/keystone/auth_inspector.pp b/manifests/keystone/auth_inspector.pp index 8ee9a4ff..6d246ec5 100644 --- a/manifests/keystone/auth_inspector.pp +++ b/manifests/keystone/auth_inspector.pp @@ -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, } - } diff --git a/manifests/logging.pp b/manifests/logging.pp index fc6861a2..81fbf3b2 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -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, } - } diff --git a/manifests/neutron.pp b/manifests/neutron.pp index f49870b0..fed27466 100644 --- a/manifests/neutron.pp +++ b/manifests/neutron.pp @@ -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 diff --git a/manifests/nova.pp b/manifests/nova.pp index 2c0925f6..dc729662 100644 --- a/manifests/nova.pp +++ b/manifests/nova.pp @@ -71,7 +71,6 @@ class ironic::nova ( $endpoint_override = $facts['os_service_default'], Boolean $send_power_notifications = true, ) { - include ironic::deps ironic_config { diff --git a/manifests/params.pp b/manifests/params.pp index 5851f63c..318a93ff 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -120,5 +120,4 @@ class ironic::params { fail("Unsupported osfamily: ${facts['os']['family']}") } } - } diff --git a/manifests/policy.pp b/manifests/policy.pp index fb2f033d..bdb30e6f 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -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, } - } diff --git a/manifests/pxe.pp b/manifests/pxe.pp index 98e069da..ffd535ce 100644 --- a/manifests/pxe.pp +++ b/manifests/pxe.pp @@ -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 diff --git a/manifests/pxe/common.pp b/manifests/pxe/common.pp index 9178ff6f..fe41ee05 100644 --- a/manifests/pxe/common.pp +++ b/manifests/pxe/common.pp @@ -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 diff --git a/manifests/pxe/tftpboot_file.pp b/manifests/pxe/tftpboot_file.pp index a60c2fd7..4433f3b7 100644 --- a/manifests/pxe/tftpboot_file.pp +++ b/manifests/pxe/tftpboot_file.pp @@ -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, } } - diff --git a/manifests/reports.pp b/manifests/reports.pp index 9413e3d8..1a666aa4 100644 --- a/manifests/reports.pp +++ b/manifests/reports.pp @@ -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': diff --git a/manifests/service_catalog.pp b/manifests/service_catalog.pp index 7dca702a..351f826a 100644 --- a/manifests/service_catalog.pp +++ b/manifests/service_catalog.pp @@ -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) { diff --git a/manifests/swift.pp b/manifests/swift.pp index eb2adb4d..ad724ea8 100644 --- a/manifests/swift.pp +++ b/manifests/swift.pp @@ -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) { diff --git a/manifests/vnc.pp b/manifests/vnc.pp index e92cab32..e80564cf 100644 --- a/manifests/vnc.pp +++ b/manifests/vnc.pp @@ -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 { diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index c4022753..e5aa7c47 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -158,7 +158,6 @@ class ironic::wsgi::apache ( $request_headers = undef, $vhost_custom_fragment = undef, ) { - include ironic::deps include ironic::params diff --git a/manifests/wsgi/uwsgi.pp b/manifests/wsgi/uwsgi.pp index 1d8c6044..44d6a6ad 100644 --- a/manifests/wsgi/uwsgi.pp +++ b/manifests/wsgi/uwsgi.pp @@ -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.') }