diff --git a/manifests/init.pp b/manifests/init.pp
index 39569fc7..ae94f3bf 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -45,7 +45,7 @@
 #
 # [*auth_strategy*]
 #   (optional) Default protocol to use when connecting to glance
-#   Defaults to 'keystone'. 'https' is the only other valid option for SSL
+#   Defaults to 'keystone'.
 #
 # [*default_resource_class*]
 #   (optional) Default resource class to use for new nodes when no resource
@@ -241,52 +241,52 @@
 #   Defaults to 'services'
 #
 class ironic (
-  Boolean $enabled                        = true,
-  Stdlib::Ensure::Package $package_ensure = 'present',
-  $host                                   = $facts['os_service_default'],
-  $my_ip                                  = $facts['os_service_default'],
-  $my_ipv6                                = $facts['os_service_default'],
-  $auth_strategy                          = 'keystone',
-  $default_resource_class                 = $facts['os_service_default'],
-  $control_exchange                       = $facts['os_service_default'],
-  $executor_thread_pool_size              = $facts['os_service_default'],
-  $rpc_response_timeout                   = $facts['os_service_default'],
-  $rpc_transport                          = $facts['os_service_default'],
-  $default_transport_url                  = $facts['os_service_default'],
-  $rabbit_use_ssl                         = $facts['os_service_default'],
-  $rabbit_heartbeat_timeout_threshold     = $facts['os_service_default'],
-  $rabbit_heartbeat_rate                  = $facts['os_service_default'],
-  $rabbit_qos_prefetch_count              = $facts['os_service_default'],
-  $rabbit_ha_queues                       = $facts['os_service_default'],
-  $rabbit_quorum_queue                    = $facts['os_service_default'],
-  $rabbit_transient_quorum_queue          = $facts['os_service_default'],
-  $rabbit_transient_queues_ttl            = $facts['os_service_default'],
-  $rabbit_quorum_delivery_limit           = $facts['os_service_default'],
-  $rabbit_quorum_max_memory_length        = $facts['os_service_default'],
-  $rabbit_quorum_max_memory_bytes         = $facts['os_service_default'],
-  $rabbit_use_queue_manager               = $facts['os_service_default'],
-  $rabbit_stream_fanout                   = $facts['os_service_default'],
-  $rabbit_enable_cancel_on_failover       = $facts['os_service_default'],
-  $kombu_ssl_ca_certs                     = $facts['os_service_default'],
-  $kombu_ssl_certfile                     = $facts['os_service_default'],
-  $kombu_ssl_keyfile                      = $facts['os_service_default'],
-  $kombu_ssl_version                      = $facts['os_service_default'],
-  $kombu_reconnect_delay                  = $facts['os_service_default'],
-  $kombu_failover_strategy                = $facts['os_service_default'],
-  $kombu_compression                      = $facts['os_service_default'],
-  $amqp_durable_queues                    = $facts['os_service_default'],
-  $amqp_auto_delete                       = $facts['os_service_default'],
-  Boolean $sync_db                        = true,
-  Boolean $db_online_data_migrations      = false,
-  Boolean $purge_config                   = false,
-  $notification_transport_url             = $facts['os_service_default'],
-  $notification_driver                    = $facts['os_service_default'],
-  $notification_topics                    = $facts['os_service_default'],
-  $notification_retry                     = $facts['os_service_default'],
-  $notification_level                     = $facts['os_service_default'],
-  $versioned_notifications_topics         = $facts['os_service_default'],
-  $rbac_service_role_elevated_access      = $facts['os_service_default'],
-  $rbac_service_project_name              = 'services',
+  Boolean $enabled                                        = true,
+  Stdlib::Ensure::Package $package_ensure                 = 'present',
+  $host                                                   = $facts['os_service_default'],
+  $my_ip                                                  = $facts['os_service_default'],
+  $my_ipv6                                                = $facts['os_service_default'],
+  Enum['noauth', 'keystone', 'http_basic'] $auth_strategy = 'keystone',
+  $default_resource_class                                 = $facts['os_service_default'],
+  $control_exchange                                       = $facts['os_service_default'],
+  $executor_thread_pool_size                              = $facts['os_service_default'],
+  $rpc_response_timeout                                   = $facts['os_service_default'],
+  $rpc_transport                                          = $facts['os_service_default'],
+  $default_transport_url                                  = $facts['os_service_default'],
+  $rabbit_use_ssl                                         = $facts['os_service_default'],
+  $rabbit_heartbeat_timeout_threshold                     = $facts['os_service_default'],
+  $rabbit_heartbeat_rate                                  = $facts['os_service_default'],
+  $rabbit_qos_prefetch_count                              = $facts['os_service_default'],
+  $rabbit_ha_queues                                       = $facts['os_service_default'],
+  $rabbit_quorum_queue                                    = $facts['os_service_default'],
+  $rabbit_transient_quorum_queue                          = $facts['os_service_default'],
+  $rabbit_transient_queues_ttl                            = $facts['os_service_default'],
+  $rabbit_quorum_delivery_limit                           = $facts['os_service_default'],
+  $rabbit_quorum_max_memory_length                        = $facts['os_service_default'],
+  $rabbit_quorum_max_memory_bytes                         = $facts['os_service_default'],
+  $rabbit_use_queue_manager                               = $facts['os_service_default'],
+  $rabbit_stream_fanout                                   = $facts['os_service_default'],
+  $rabbit_enable_cancel_on_failover                       = $facts['os_service_default'],
+  $kombu_ssl_ca_certs                                     = $facts['os_service_default'],
+  $kombu_ssl_certfile                                     = $facts['os_service_default'],
+  $kombu_ssl_keyfile                                      = $facts['os_service_default'],
+  $kombu_ssl_version                                      = $facts['os_service_default'],
+  $kombu_reconnect_delay                                  = $facts['os_service_default'],
+  $kombu_failover_strategy                                = $facts['os_service_default'],
+  $kombu_compression                                      = $facts['os_service_default'],
+  $amqp_durable_queues                                    = $facts['os_service_default'],
+  $amqp_auto_delete                                       = $facts['os_service_default'],
+  Boolean $sync_db                                        = true,
+  Boolean $db_online_data_migrations                      = false,
+  Boolean $purge_config                                   = false,
+  $notification_transport_url                             = $facts['os_service_default'],
+  $notification_driver                                    = $facts['os_service_default'],
+  $notification_topics                                    = $facts['os_service_default'],
+  $notification_retry                                     = $facts['os_service_default'],
+  $notification_level                                     = $facts['os_service_default'],
+  $versioned_notifications_topics                         = $facts['os_service_default'],
+  $rbac_service_role_elevated_access                      = $facts['os_service_default'],
+  $rbac_service_project_name                              = 'services',
 ) {
   include ironic::deps
   include ironic::db
diff --git a/manifests/json_rpc.pp b/manifests/json_rpc.pp
index 75ebfc93..66880f1b 100644
--- a/manifests/json_rpc.pp
+++ b/manifests/json_rpc.pp
@@ -83,21 +83,21 @@
 #
 class ironic::json_rpc (
   $password,
-  $auth_strategy             = 'keystone',
-  $http_basic_auth_user_file = $facts['os_service_default'],
-  $host_ip                   = $facts['os_service_default'],
-  $port                      = $facts['os_service_default'],
-  Boolean $use_ssl           = false,
-  $auth_type                 = 'password',
-  $auth_url                  = 'http://127.0.0.1:5000',
-  $project_name              = 'services',
-  $username                  = 'ironic',
-  $user_domain_name          = 'Default',
-  $project_domain_name       = 'Default',
-  $system_scope              = $facts['os_service_default'],
-  $allowed_roles             = $facts['os_service_default'],
-  $endpoint_override         = $facts['os_service_default'],
-  $region_name               = $facts['os_service_default'],
+  Enum['noauth', 'keystone', 'http_basic'] $auth_strategy = 'keystone',
+  $http_basic_auth_user_file                              = $facts['os_service_default'],
+  $host_ip                                                = $facts['os_service_default'],
+  $port                                                   = $facts['os_service_default'],
+  Boolean $use_ssl                                        = false,
+  $auth_type                                              = 'password',
+  $auth_url                                               = 'http://127.0.0.1:5000',
+  $project_name                                           = 'services',
+  $username                                               = 'ironic',
+  $user_domain_name                                       = 'Default',
+  $project_domain_name                                    = 'Default',
+  $system_scope                                           = $facts['os_service_default'],
+  $allowed_roles                                          = $facts['os_service_default'],
+  $endpoint_override                                      = $facts['os_service_default'],
+  $region_name                                            = $facts['os_service_default'],
 ) {
   include ironic::deps