From 642af023fe4acb1363c217026564f15e2a1e24b0 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 1 Feb 2017 22:31:49 -0500 Subject: [PATCH] Align the stars nova: do not install virtlockd and virtlog (workaround) virtlog and virtlockd services are not idempotent with our version of Puppet when deploying on Ubuntu. See https://tickets.puppetlabs.com/browse/PUP-6370 Note: we already had this issue 8 months ago: https://review.openstack.org/#/c/324816 But it was fixed after Puppet 4.5. We'll have to investigate. Change-Id: I2059b83d055d551872f4b63dc952af775f83c020 Disable the deprecation warnings as errors for puppet-syntax Recently puppet4 started deprecating ruby 2.0 with the following commit: https://github.com/puppetlabs/puppet/commit/e9eda7ed56fddcf185fc155d7e0ae054ea327504 One way to work-around this (in the absence of a more recent ruby version) is to not treat this deprecation warnings as fatal when doing the puppet syntax check Change-Id: If31ac681c75c6eb361dbb58682233160b31ae113 Related-Bug: #1660943 Co-Authorized-By: Michele Baldessari --- Rakefile | 1 + manifests/nova.pp | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) 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':