diff --git a/manifests/api.pp b/manifests/api.pp
index 0df315cd0..82fb19667 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -136,35 +136,35 @@
 #   Defaults to undef
 #
 class nova::api (
-  Boolean $enabled                             = true,
-  Boolean $manage_service                      = true,
-  $api_paste_config                            = 'api-paste.ini',
-  $ensure_package                              = 'present',
-  Boolean $sync_db                             = true,
-  Boolean $sync_db_api                         = true,
-  Boolean $db_online_data_migrations           = false,
-  $service_name                                = $nova::params::api_service_name,
-  $metadata_service_name                       = $nova::params::api_metadata_service_name,
-  $enable_proxy_headers_parsing                = $facts['os_service_default'],
-  $max_request_body_size                       = $facts['os_service_default'],
-  $max_limit                                   = $facts['os_service_default'],
-  $compute_link_prefix                         = $facts['os_service_default'],
-  $glance_link_prefix                          = $facts['os_service_default'],
-  $enable_instance_password                    = $facts['os_service_default'],
-  $password_length                             = $facts['os_service_default'],
-  $allow_resize_to_same_host                   = $facts['os_service_default'],
-  $instance_list_per_project_cells             = $facts['os_service_default'],
-  $instance_list_cells_batch_strategy          = $facts['os_service_default'],
-  $instance_list_cells_batch_fixed_size        = $facts['os_service_default'],
-  $list_records_by_skipping_down_cells         = $facts['os_service_default'],
+  Boolean $enabled                        = true,
+  Boolean $manage_service                 = true,
+  $api_paste_config                       = 'api-paste.ini',
+  Stdlib::Ensure::Package $ensure_package = 'present',
+  Boolean $sync_db                        = true,
+  Boolean $sync_db_api                    = true,
+  Boolean $db_online_data_migrations      = false,
+  $service_name                           = $nova::params::api_service_name,
+  $metadata_service_name                  = $nova::params::api_metadata_service_name,
+  $enable_proxy_headers_parsing           = $facts['os_service_default'],
+  $max_request_body_size                  = $facts['os_service_default'],
+  $max_limit                              = $facts['os_service_default'],
+  $compute_link_prefix                    = $facts['os_service_default'],
+  $glance_link_prefix                     = $facts['os_service_default'],
+  $enable_instance_password               = $facts['os_service_default'],
+  $password_length                        = $facts['os_service_default'],
+  $allow_resize_to_same_host              = $facts['os_service_default'],
+  $instance_list_per_project_cells        = $facts['os_service_default'],
+  $instance_list_cells_batch_strategy     = $facts['os_service_default'],
+  $instance_list_cells_batch_fixed_size   = $facts['os_service_default'],
+  $list_records_by_skipping_down_cells    = $facts['os_service_default'],
   # DEPRECATED PARAMETERS
-  $api_bind_address                            = undef,
-  $osapi_compute_listen_port                   = undef,
-  $metadata_listen                             = undef,
-  $metadata_listen_port                        = undef,
-  $enabled_apis                                = undef,
-  $osapi_compute_workers                       = undef,
-  $metadata_workers                            = undef,
+  $api_bind_address                       = undef,
+  $osapi_compute_listen_port              = undef,
+  $metadata_listen                        = undef,
+  $metadata_listen_port                   = undef,
+  $enabled_apis                           = undef,
+  $osapi_compute_workers                  = undef,
+  $metadata_workers                       = undef,
 ) inherits nova::params {
   include nova::deps
   include nova::db
diff --git a/manifests/client.pp b/manifests/client.pp
index 1d76a71d3..e84c1c799 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -9,7 +9,7 @@
 #   Defaults to 'present'
 #
 class nova::client (
-  $ensure = 'present'
+  Stdlib::Ensure::Package $ensure = 'present',
 ) {
   include nova::deps
   include nova::params
diff --git a/manifests/compute.pp b/manifests/compute.pp
index bd29b19e9..85aed1494 100644
--- a/manifests/compute.pp
+++ b/manifests/compute.pp
@@ -265,7 +265,7 @@
 class nova::compute (
   Boolean $enabled                             = true,
   Boolean $manage_service                      = true,
-  $ensure_package                              = 'present',
+  Stdlib::Ensure::Package $ensure_package      = 'present',
   Boolean $vnc_enabled                         = true,
   Boolean $spice_enabled                       = false,
   $vncserver_proxyclient_address               = $facts['os_service_default'],
diff --git a/manifests/compute/ironic.pp b/manifests/compute/ironic.pp
index 71d4533ef..18dbe577d 100644
--- a/manifests/compute/ironic.pp
+++ b/manifests/compute/ironic.pp
@@ -13,8 +13,8 @@
 #   Defaults to 'ironic.IronicDriver'
 #
 class nova::compute::ironic (
-  $ensure_package = 'present',
-  $compute_driver = 'ironic.IronicDriver',
+  Stdlib::Ensure::Package $ensure_package = 'present',
+  $compute_driver                         = 'ironic.IronicDriver',
 ) {
   include nova::deps
   require nova::ironic::common
diff --git a/manifests/compute/libvirt.pp b/manifests/compute/libvirt.pp
index 1fcec2e0e..a497854b7 100644
--- a/manifests/compute/libvirt.pp
+++ b/manifests/compute/libvirt.pp
@@ -244,7 +244,7 @@
 #   Defaults to undef
 #
 class nova::compute::libvirt (
-  $ensure_package                             = 'present',
+  Stdlib::Ensure::Package $ensure_package     = 'present',
   Nova::VirtType $virt_type                   = 'kvm',
   String[1] $vncserver_listen                 = '127.0.0.1',
   Boolean $migration_support                  = false,
diff --git a/manifests/compute/libvirt/services.pp b/manifests/compute/libvirt/services.pp
index e37932ec7..637703683 100644
--- a/manifests/compute/libvirt/services.pp
+++ b/manifests/compute/libvirt/services.pp
@@ -58,19 +58,19 @@
 #   Defaults to false
 #
 class nova::compute::libvirt::services (
-  $ensure_package           = 'present',
-  $libvirt_service_name     = $nova::params::libvirt_service_name,
-  $virtlock_service_name    = $nova::params::virtlock_service_name,
-  $virtlog_service_name     = $nova::params::virtlog_service_name,
-  $libvirt_virt_type        = 'kvm',
-  $modular_libvirt          = $nova::params::modular_libvirt,
-  $virtsecret_service_name  = $nova::params::virtsecret_socket_name,
-  $virtnodedev_service_name = $nova::params::virtnodedev_socket_name,
-  $virtqemu_service_name    = $nova::params::virtqemu_socket_name,
-  $virtproxy_service_name   = $nova::params::virtproxy_socket_name,
-  $virtstorage_service_name = $nova::params::virtstorage_socket_name,
-  Boolean $manage_ovmf      = true,
-  Boolean $manage_swtpm     = false,
+  Stdlib::Ensure::Package $ensure_package = 'present',
+  $libvirt_service_name                   = $nova::params::libvirt_service_name,
+  $virtlock_service_name                  = $nova::params::virtlock_service_name,
+  $virtlog_service_name                   = $nova::params::virtlog_service_name,
+  $libvirt_virt_type                      = 'kvm',
+  $modular_libvirt                        = $nova::params::modular_libvirt,
+  $virtsecret_service_name                = $nova::params::virtsecret_socket_name,
+  $virtnodedev_service_name               = $nova::params::virtnodedev_socket_name,
+  $virtqemu_service_name                  = $nova::params::virtqemu_socket_name,
+  $virtproxy_service_name                 = $nova::params::virtproxy_socket_name,
+  $virtstorage_service_name               = $nova::params::virtstorage_socket_name,
+  Boolean $manage_ovmf                    = true,
+  Boolean $manage_swtpm                   = false,
 ) inherits nova::params {
   include nova::deps
   include nova::params
diff --git a/manifests/compute/libvirt_guests.pp b/manifests/compute/libvirt_guests.pp
index 3e691707e..49e9b724d 100644
--- a/manifests/compute/libvirt_guests.pp
+++ b/manifests/compute/libvirt_guests.pp
@@ -69,7 +69,7 @@
 #
 class nova::compute::libvirt_guests (
   Boolean $enabled                         = false,
-  $package_ensure                          = 'present',
+  Stdlib::Ensure::Package $package_ensure  = 'present',
   Enum['start', 'ignore'] $on_boot         = 'ignore',
   Enum['suspend', 'shutdown'] $on_shutdown = 'shutdown',
   Optional[Integer[0]] $start_delay        = undef,
diff --git a/manifests/compute/rbd.pp b/manifests/compute/rbd.pp
index 84b8001fb..e9b51ae15 100644
--- a/manifests/compute/rbd.pp
+++ b/manifests/compute/rbd.pp
@@ -112,8 +112,8 @@ class nova::compute::rbd (
   $libvirt_rbd_destroy_volume_retries           = $facts['os_service_default'],
   Boolean $ephemeral_storage                    = true,
   Boolean $manage_ceph_client                   = true,
-  $ceph_client_ensure                           = 'present',
-  $package_ensure                               = 'present',
+  Stdlib::Ensure::Package $ceph_client_ensure   = 'present',
+  Stdlib::Ensure::Package $package_ensure       = 'present',
   Boolean $manage_libvirt_secret                = true,
 ) {
   include nova::deps
diff --git a/manifests/conductor.pp b/manifests/conductor.pp
index b6c7779da..1dd204e0e 100644
--- a/manifests/conductor.pp
+++ b/manifests/conductor.pp
@@ -28,11 +28,11 @@
 #   Defaults to $facts['os_service_default']
 #
 class nova::conductor (
-  Boolean $enabled        = true,
-  Boolean $manage_service = true,
-  $ensure_package         = 'present',
-  $workers                = $facts['os_workers'],
-  $enable_new_services    = $facts['os_service_default'],
+  Boolean $enabled                        = true,
+  Boolean $manage_service                 = true,
+  Stdlib::Ensure::Package $ensure_package = 'present',
+  $workers                                = $facts['os_workers'],
+  $enable_new_services                    = $facts['os_service_default'],
 ) {
   include nova::deps
   include nova::db
diff --git a/manifests/generic_service.pp b/manifests/generic_service.pp
index 7c67fe35d..62971eed2 100644
--- a/manifests/generic_service.pp
+++ b/manifests/generic_service.pp
@@ -33,9 +33,9 @@
 define nova::generic_service (
   $package_name,
   $service_name,
-  Boolean $enabled        = true,
-  Boolean $manage_service = true,
-  $ensure_package         = 'present'
+  Boolean $enabled                        = true,
+  Boolean $manage_service                 = true,
+  Stdlib::Ensure::Package $ensure_package = 'present',
 ) {
   include nova::deps
   include nova::params
diff --git a/manifests/init.pp b/manifests/init.pp
index 1a50fd71a..71f0baa16 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -352,7 +352,7 @@
 #   Defaults to $facts['os_service_default']
 #
 class nova (
-  $ensure_package                          = 'present',
+  Stdlib::Ensure::Package $ensure_package  = 'present',
   $default_transport_url                   = $facts['os_service_default'],
   $rpc_response_timeout                    = $facts['os_service_default'],
   $long_rpc_timeout                        = $facts['os_service_default'],
diff --git a/manifests/scheduler.pp b/manifests/scheduler.pp
index e11f7bed0..7992960b1 100644
--- a/manifests/scheduler.pp
+++ b/manifests/scheduler.pp
@@ -69,7 +69,7 @@
 class nova::scheduler (
   Boolean $enabled                               = true,
   Boolean $manage_service                        = true,
-  $ensure_package                                = 'present',
+  Stdlib::Ensure::Package $ensure_package        = 'present',
   $workers                                       = $facts['os_workers'],
   $max_attempts                                  = $facts['os_service_default'],
   $discover_hosts_in_cells_interval              = $facts['os_service_default'],
diff --git a/manifests/serialproxy.pp b/manifests/serialproxy.pp
index e4ddf5ff1..fb42337a3 100644
--- a/manifests/serialproxy.pp
+++ b/manifests/serialproxy.pp
@@ -25,11 +25,11 @@
 #   Defaults to 'present'
 #
 class nova::serialproxy (
-  Boolean $enabled        = true,
-  Boolean $manage_service = true,
-  $serialproxy_host       = $facts['os_service_default'],
-  $serialproxy_port       = $facts['os_service_default'],
-  $ensure_package         = 'present'
+  Boolean $enabled                        = true,
+  Boolean $manage_service                 = true,
+  $serialproxy_host                       = $facts['os_service_default'],
+  $serialproxy_port                       = $facts['os_service_default'],
+  Stdlib::Ensure::Package $ensure_package = 'present',
 ) {
   include nova::deps
   include nova::params
diff --git a/manifests/spicehtml5proxy.pp b/manifests/spicehtml5proxy.pp
index 2eeeeb5cc..a774cc40a 100644
--- a/manifests/spicehtml5proxy.pp
+++ b/manifests/spicehtml5proxy.pp
@@ -29,11 +29,11 @@
 #   Defaults to 'present'
 #
 class nova::spicehtml5proxy (
-  Boolean $enabled        = true,
-  Boolean $manage_service = true,
-  $host                   = '0.0.0.0',
-  $port                   = '6082',
-  $ensure_package         = 'present'
+  Boolean $enabled                        = true,
+  Boolean $manage_service                 = true,
+  $host                                   = '0.0.0.0',
+  $port                                   = '6082',
+  Stdlib::Ensure::Package $ensure_package = 'present',
 ) {
   include nova::deps
   include nova::params
diff --git a/manifests/vncproxy.pp b/manifests/vncproxy.pp
index 5d0d795fa..f95ce55f2 100644
--- a/manifests/vncproxy.pp
+++ b/manifests/vncproxy.pp
@@ -67,7 +67,7 @@ class nova::vncproxy (
   String[1] $host                          = '0.0.0.0',
   Stdlib::Port $port                       = 6080,
   String $vncproxy_path                    = '/vnc_auto.html',
-  $ensure_package                          = 'present',
+  Stdlib::Ensure::Package $ensure_package  = 'present',
   Boolean $allow_noauth                    = true,
   Boolean $allow_vencrypt                  = false,
   $vencrypt_key                            = undef,
diff --git a/manifests/wsgi/apache_metadata.pp b/manifests/wsgi/apache_metadata.pp
index c1f9477ea..1ef0e08a0 100644
--- a/manifests/wsgi/apache_metadata.pp
+++ b/manifests/wsgi/apache_metadata.pp
@@ -141,35 +141,35 @@
 #   class { 'nova::wsgi::apache_metadata': }
 #
 class nova::wsgi::apache_metadata (
-  $servername                  = $facts['networking']['fqdn'],
-  $port                        = 8775,
-  $bind_host                   = undef,
-  $path                        = '/',
-  $ssl                         = false,
-  $workers                     = $facts['os_workers'],
-  $ssl_cert                    = undef,
-  $ssl_key                     = undef,
-  $ssl_chain                   = undef,
-  $ssl_ca                      = undef,
-  $ssl_crl_path                = undef,
-  $ssl_crl                     = undef,
-  $ssl_certs_dir               = undef,
-  $wsgi_process_display_name   = undef,
-  $threads                     = 1,
-  $priority                    = 10,
-  $ensure_package              = 'present',
-  $access_log_file             = undef,
-  $access_log_pipe             = undef,
-  $access_log_syslog           = undef,
-  $access_log_format           = undef,
-  $access_log_env_var          = undef,
-  $error_log_file              = undef,
-  $error_log_pipe              = undef,
-  $error_log_syslog            = undef,
-  $custom_wsgi_process_options = {},
-  $headers                     = undef,
-  $request_headers             = undef,
-  $vhost_custom_fragment       = undef,
+  $servername                             = $facts['networking']['fqdn'],
+  $port                                   = 8775,
+  $bind_host                              = undef,
+  $path                                   = '/',
+  $ssl                                    = false,
+  $workers                                = $facts['os_workers'],
+  $ssl_cert                               = undef,
+  $ssl_key                                = undef,
+  $ssl_chain                              = undef,
+  $ssl_ca                                 = undef,
+  $ssl_crl_path                           = undef,
+  $ssl_crl                                = undef,
+  $ssl_certs_dir                          = undef,
+  $wsgi_process_display_name              = undef,
+  $threads                                = 1,
+  $priority                               = 10,
+  Stdlib::Ensure::Package $ensure_package = 'present',
+  $access_log_file                        = undef,
+  $access_log_pipe                        = undef,
+  $access_log_syslog                      = undef,
+  $access_log_format                      = undef,
+  $access_log_env_var                     = undef,
+  $error_log_file                         = undef,
+  $error_log_pipe                         = undef,
+  $error_log_syslog                       = undef,
+  $custom_wsgi_process_options            = {},
+  $headers                                = undef,
+  $request_headers                        = undef,
+  $vhost_custom_fragment                  = undef,
 ) {
   include nova::params