diff --git a/manifests/conductor.pp b/manifests/conductor.pp index 3acbc031..05c27c53 100644 --- a/manifests/conductor.pp +++ b/manifests/conductor.pp @@ -215,7 +215,7 @@ class ironic::conductor ( $enabled_hardware_types = $facts['os_service_default'], $force_power_state_during_sync = $facts['os_service_default'], $http_url = $facts['os_service_default'], - $http_root = '/httpboot', + Stdlib::Absolutepath $http_root = '/httpboot', $force_raw_images = $facts['os_service_default'], $automated_clean = $facts['os_service_default'], $cleaning_network = $facts['os_service_default'], diff --git a/manifests/drivers/pxe.pp b/manifests/drivers/pxe.pp index e9f5dabc..876db794 100644 --- a/manifests/drivers/pxe.pp +++ b/manifests/drivers/pxe.pp @@ -140,7 +140,7 @@ class ironic::drivers::pxe ( $ipxe_bootfile_name = $facts['os_service_default'], $ipxe_config_template = $facts['os_service_default'], $tftp_server = $facts['os_service_default'], - $tftp_root = '/tftpboot', + Stdlib::Absolutepath $tftp_root = '/tftpboot', $images_path = $facts['os_service_default'], $tftp_master_path = $facts['os_service_default'], $instance_master_path = $facts['os_service_default'], diff --git a/manifests/inspector.pp b/manifests/inspector.pp index 8fea1e7f..c1b5b515 100644 --- a/manifests/inspector.pp +++ b/manifests/inspector.pp @@ -344,8 +344,8 @@ class ironic::inspector ( Integer[0] $ipxe_timeout = 0, $http_port = '8088', $detect_boot_mode = $facts['os_service_default'], - $tftp_root = '/tftpboot', - $http_root = '/httpboot', + Stdlib::Absolutepath $tftp_root = '/tftpboot', + Stdlib::Absolutepath $http_root = '/httpboot', $node_not_found_hook = $facts['os_service_default'], $discovery_default_driver = $facts['os_service_default'], Boolean $enable_ppc64le = false, diff --git a/manifests/pxe.pp b/manifests/pxe.pp index fc0adb99..81ec1fe1 100644 --- a/manifests/pxe.pp +++ b/manifests/pxe.pp @@ -104,25 +104,25 @@ # Defaults to {} # class ironic::pxe ( - $package_ensure = 'present', - Boolean $manage_service = true, - Boolean $enabled = true, - $tftp_root = '/tftpboot', - $http_root = '/httpboot', - $http_port = 8088, - $pxelinux_path = $::ironic::params::pxelinux_path, - $syslinux_path = $::ironic::params::syslinux_path, - $syslinux_files = $::ironic::params::syslinux_files, - $tftp_bind_host = undef, - String[1] $ipxe_name_base = $::ironic::params::ipxe_name_base, - String[1] $uefi_ipxe_bootfile_name = $::ironic::params::uefi_ipxe_bootfile_name, - String[1] $uefi_pxe_bootfile_name = $::ironic::params::uefi_pxe_bootfile_name, - Boolean $tftp_use_xinetd = $::ironic::params::xinetd_available, - $dnsmasq_log_facility = undef, - Boolean $manage_http_server = true, - $vhost_priority = 10, - Array[String] $vhost_options = ['-Indexes', '+FollowSymLinks'], - Hash $vhost_config = {}, + $package_ensure = 'present', + Boolean $manage_service = true, + Boolean $enabled = true, + Stdlib::Absolutepath $tftp_root = '/tftpboot', + Stdlib::Absolutepath $http_root = '/httpboot', + $http_port = 8088, + Optional[Variant[Stdlib::Absolutepath, Boolean]] $pxelinux_path = $::ironic::params::pxelinux_path, + Optional[Variant[Stdlib::Absolutepath, Boolean]] $syslinux_path = $::ironic::params::syslinux_path, + Optional[Array[String[1]]] $syslinux_files = $::ironic::params::syslinux_files, + $tftp_bind_host = undef, + String[1] $ipxe_name_base = $::ironic::params::ipxe_name_base, + String[1] $uefi_ipxe_bootfile_name = $::ironic::params::uefi_ipxe_bootfile_name, + String[1] $uefi_pxe_bootfile_name = $::ironic::params::uefi_pxe_bootfile_name, + Boolean $tftp_use_xinetd = $::ironic::params::xinetd_available, + $dnsmasq_log_facility = undef, + Boolean $manage_http_server = true, + $vhost_priority = 10, + Array[String] $vhost_options = ['-Indexes', '+FollowSymLinks'], + Hash $vhost_config = {}, ) inherits ironic::params { include ironic::deps diff --git a/manifests/pxe/common.pp b/manifests/pxe/common.pp index ab72b0dc..9178ff6f 100644 --- a/manifests/pxe/common.pp +++ b/manifests/pxe/common.pp @@ -46,8 +46,8 @@ # Defaults to undef. # class ironic::pxe::common ( - $tftp_root = undef, - $http_root = undef, + Optional[Stdlib::Absolutepath] $tftp_root = undef, + Optional[Stdlib::Absolutepath] $http_root = undef, $http_port = undef, Optional[Integer[0]] $ipxe_timeout = undef, Optional[String[1]] $uefi_ipxe_bootfile_name = undef,