diff --git a/Rakefile b/Rakefile
index 0de787ae3..0c911f26e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,3 +4,4 @@ require 'puppet-lint/tasks/puppet-lint'
 PuppetLint.configuration.fail_on_warnings = true
 PuppetLint.configuration.send('disable_80chars')
 PuppetLint.configuration.send('disable_class_inherits_from_params_class')
+PuppetSyntax.fail_on_deprecation_notices = false
diff --git a/manifests/nova.pp b/manifests/nova.pp
index 4f9da920e..873de3386 100644
--- a/manifests/nova.pp
+++ b/manifests/nova.pp
@@ -156,10 +156,15 @@ class openstack_integration::nova (
     barbican_endpoint           => $barbican_endpoint,
   }
   class { '::nova::compute::libvirt':
-    libvirt_virt_type => $libvirt_virt_type,
-    libvirt_cpu_mode  => $libvirt_cpu_mode,
-    migration_support => true,
-    vncserver_listen  => '0.0.0.0',
+    libvirt_virt_type     => $libvirt_virt_type,
+    libvirt_cpu_mode      => $libvirt_cpu_mode,
+    migration_support     => true,
+    vncserver_listen      => '0.0.0.0',
+    # virtlock and virtlog services resources are not idempotent
+    # on Ubuntu, let's disable it for now.
+    # https://tickets.puppetlabs.com/browse/PUP-6370
+    virtlock_service_name => false,
+    virtlog_service_name  => false,
   }
   if $libvirt_rbd {
     class { '::nova::compute::rbd':