openstack/puppet-openstack-integration
Code Issues Proposed changes

Align the stars

Browse Source 
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: e9eda7ed56

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 <michele@acksyn.org>
This commit is contained in:
Emilien Macchi 2017-02-01 22:31:49 -05:00
parent 543c0d8ce5
commit 642af023fe
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Rakefile
View File

@ -4,3 +4,4 @@ require 'puppet-lint/tasks/puppet-lint'
PuppetLint.configuration.fail_on_warnings = true PuppetLint.configuration.fail_on_warnings = true
PuppetLint.configuration.send('disable_80chars') PuppetLint.configuration.send('disable_80chars')
PuppetLint.configuration.send('disable_class_inherits_from_params_class') PuppetLint.configuration.send('disable_class_inherits_from_params_class')
PuppetSyntax.fail_on_deprecation_notices = false

13
manifests/nova.pp
View File

@ -156,10 +156,15 @@ class openstack_integration::nova (
barbican_endpoint => $barbican_endpoint, barbican_endpoint => $barbican_endpoint,
} }
class { '::nova::compute::libvirt': class { '::nova::compute::libvirt':
libvirt_virt_type => $libvirt_virt_type, libvirt_virt_type => $libvirt_virt_type,
libvirt_cpu_mode => $libvirt_cpu_mode, libvirt_cpu_mode => $libvirt_cpu_mode,
migration_support => true, migration_support => true,
vncserver_listen => '0.0.0.0', 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 { if $libvirt_rbd {
class { '::nova::compute::rbd': class { '::nova::compute::rbd':