diff --git a/manifests/compute/libvirt.pp b/manifests/compute/libvirt.pp
index 88768fa88..72566fd55 100644
--- a/manifests/compute/libvirt.pp
+++ b/manifests/compute/libvirt.pp
@@ -71,17 +71,17 @@
 #
 # [*inject_password*]
 #   (optional) Inject the admin password at boot time, without an agent.
-#   Defaults to false
+#   Defaults to $::os_service_default
 #
 # [*inject_key*]
 #   (optional) Inject the ssh public key at boot time.
-#   Defaults to false
+#   Defaults to $::os_service_default
 #
 # [*inject_partition*]
 #   (optional) The partition to inject to : -2 => disable, -1 => inspect
 #   (libguestfs only), 0 => not partitioned, >0 => partition
 #   number (integer value)
-#   Defaults to -2
+#   Defaults to $::os_service_default
 #
 # [*enabled_perf_events*]
 #   (optional) This is a performance event list which could be used as monitor.
@@ -249,9 +249,9 @@ class nova::compute::libvirt (
   $hw_disk_discard                            = $::os_service_default,
   $hw_machine_type                            = $::os_service_default,
   $sysinfo_serial                             = $::os_service_default,
-  $inject_password                            = false,
-  $inject_key                                 = false,
-  $inject_partition                           = -2,
+  $inject_password                            = $::os_service_default,
+  $inject_key                                 = $::os_service_default,
+  $inject_partition                           = $::os_service_default,
   $enabled_perf_events                        = $::os_service_default,
   $device_detach_attempts                     = $::os_service_default,
   $device_detach_timeout                      = $::os_service_default,
diff --git a/spec/classes/nova_compute_libvirt_spec.rb b/spec/classes/nova_compute_libvirt_spec.rb
index d8d131468..bd348cda7 100644
--- a/spec/classes/nova_compute_libvirt_spec.rb
+++ b/spec/classes/nova_compute_libvirt_spec.rb
@@ -54,9 +54,9 @@ describe 'nova::compute::libvirt' do
       it { is_expected.to contain_nova_config('libvirt/snapshot_image_format').with_value('<SERVICE DEFAULT>')}
       it { is_expected.to contain_nova_config('libvirt/snapshots_directory').with_value('<SERVICE DEFAULT>')}
       it { is_expected.to contain_nova_config('libvirt/disk_cachemodes').with_ensure('absent')}
-      it { is_expected.to contain_nova_config('libvirt/inject_password').with_value(false)}
-      it { is_expected.to contain_nova_config('libvirt/inject_key').with_value(false)}
-      it { is_expected.to contain_nova_config('libvirt/inject_partition').with_value(-2)}
+      it { is_expected.to contain_nova_config('libvirt/inject_password').with_value('<SERVICE DEFAULT>')}
+      it { is_expected.to contain_nova_config('libvirt/inject_key').with_value('<SERVICE DEFAULT>')}
+      it { is_expected.to contain_nova_config('libvirt/inject_partition').with_value('<SERVICE DEFAULT>')}
       it { is_expected.to contain_nova_config('libvirt/enabled_perf_events').with_value('<SERVICE DEFAULT>')}
       it { is_expected.to contain_nova_config('libvirt/sysinfo_serial').with_value('<SERVICE DEFAULT>')}
       it { is_expected.to contain_nova_config('libvirt/device_detach_attempts').with_value('<SERVICE DEFAULT>')}
@@ -273,9 +273,9 @@ describe 'nova::compute::libvirt' do
 
       it { is_expected.to contain_nova_config('DEFAULT/compute_driver').with_value('libvirt.LibvirtDriver')}
       it { is_expected.to contain_nova_config('libvirt/virt_type').with_value('kvm')}
-      it { is_expected.to contain_nova_config('libvirt/inject_password').with_value(false)}
-      it { is_expected.to contain_nova_config('libvirt/inject_key').with_value(false)}
-      it { is_expected.to contain_nova_config('libvirt/inject_partition').with_value(-2)}
+      it { is_expected.to contain_nova_config('libvirt/inject_password').with_value('<SERVICE DEFAULT>')}
+      it { is_expected.to contain_nova_config('libvirt/inject_key').with_value('<SERVICE DEFAULT>')}
+      it { is_expected.to contain_nova_config('libvirt/inject_partition').with_value('<SERVICE DEFAULT>')}
       it { is_expected.to contain_nova_config('vnc/server_listen').with_value('127.0.0.1')}
       it { is_expected.to contain_nova_config('libvirt/enabled_perf_events').with_value('<SERVICE DEFAULT>')}
       it { is_expected.to contain_nova_config('libvirt/device_detach_attempts').with_value('<SERVICE DEFAULT>')}