diff --git a/manifests/api/authtoken.pp b/manifests/api/authtoken.pp index 41e7eddf..31472fd7 100644 --- a/manifests/api/authtoken.pp +++ b/manifests/api/authtoken.pp @@ -240,7 +240,7 @@ class ironic::api::authtoken( keystone::resource::authtoken { 'ironic_config': - * => $params; + * => $params; default: username => $username, password => $password, diff --git a/manifests/drivers/pxe.pp b/manifests/drivers/pxe.pp index e36fda5f..b57d48fa 100644 --- a/manifests/drivers/pxe.pp +++ b/manifests/drivers/pxe.pp @@ -167,25 +167,25 @@ class ironic::drivers::pxe ( # Configure ironic.conf ironic_config { - 'pxe/kernel_append_params': value => $kernel_append_params; - 'pxe/pxe_bootfile_name': value => $pxe_bootfile_name; - 'pxe/pxe_config_template': value => $pxe_config_template; - 'pxe/ipxe_bootfile_name': value => $ipxe_bootfile_name; - 'pxe/ipxe_config_template': value => $ipxe_config_template; - 'pxe/tftp_server': value => $tftp_server; - 'pxe/tftp_root': value => $tftp_root_real; - 'pxe/images_path': value => $images_path; - 'pxe/tftp_master_path': value => $tftp_master_path; - 'pxe/instance_master_path': value => $instance_master_path; - 'pxe/uefi_pxe_bootfile_name': value => $uefi_pxe_bootfile_name_real; - 'pxe/uefi_pxe_config_template': value => $uefi_pxe_config_template; - 'pxe/uefi_ipxe_bootfile_name': value => $uefi_ipxe_bootfile_name_real; - 'pxe/ipxe_timeout': value => $ipxe_timeout_real; - 'pxe/boot_retry_timeout': value => $boot_retry_timeout; + 'pxe/kernel_append_params': value => $kernel_append_params; + 'pxe/pxe_bootfile_name': value => $pxe_bootfile_name; + 'pxe/pxe_config_template': value => $pxe_config_template; + 'pxe/ipxe_bootfile_name': value => $ipxe_bootfile_name; + 'pxe/ipxe_config_template': value => $ipxe_config_template; + 'pxe/tftp_server': value => $tftp_server; + 'pxe/tftp_root': value => $tftp_root_real; + 'pxe/images_path': value => $images_path; + 'pxe/tftp_master_path': value => $tftp_master_path; + 'pxe/instance_master_path': value => $instance_master_path; + 'pxe/uefi_pxe_bootfile_name': value => $uefi_pxe_bootfile_name_real; + 'pxe/uefi_pxe_config_template': value => $uefi_pxe_config_template; + 'pxe/uefi_ipxe_bootfile_name': value => $uefi_ipxe_bootfile_name_real; + 'pxe/ipxe_timeout': value => $ipxe_timeout_real; + 'pxe/boot_retry_timeout': value => $boot_retry_timeout; 'pxe/boot_retry_check_interval': value => $boot_retry_check_interval; - 'pxe/dir_permission': value => $dir_permission; - 'pxe/file_permission': value => $file_permission; - 'pxe/loader_file_paths': value => $loader_file_paths_real; + 'pxe/dir_permission': value => $dir_permission; + 'pxe/file_permission': value => $file_permission; + 'pxe/loader_file_paths': value => $loader_file_paths_real; } $pxe_bootfile_name_by_arch_real = $pxe_bootfile_name_by_arch ? { diff --git a/manifests/inspector/authtoken.pp b/manifests/inspector/authtoken.pp index 672fb5a9..6ab24fcc 100644 --- a/manifests/inspector/authtoken.pp +++ b/manifests/inspector/authtoken.pp @@ -243,7 +243,7 @@ class ironic::inspector::authtoken( keystone::resource::authtoken { 'ironic_inspector_config': - * => $params; + * => $params; default: username => $username, password => $password, diff --git a/manifests/pxe.pp b/manifests/pxe.pp index be30ef22..645521b7 100644 --- a/manifests/pxe.pp +++ b/manifests/pxe.pp @@ -208,7 +208,7 @@ class ironic::pxe ( warning('Any prior xinetd based tftp server should be disabled and removed from the system.') file { "${tftp_root_real}/map-file": - ensure => 'absent', + ensure => 'absent', } package { 'dnsmasq-tftp-server':