From 8a02f5b441a7da731d16375857ed59773475e357 Mon Sep 17 00:00:00 2001 From: Luca Miccini Date: Fri, 26 Jun 2020 10:00:31 +0200 Subject: [PATCH] Fix puppet-lint warnings Change-Id: I118ea3c33395f0ca75f38413e9be375b3e6e3726 --- manifests/certmonger/ca/crl.pp | 4 ++-- manifests/profile/base/nova/conductor.pp | 4 ++++ manifests/profile/base/tuned.pp | 10 +++++----- manifests/ui.pp | 6 +++--- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/manifests/certmonger/ca/crl.pp b/manifests/certmonger/ca/crl.pp index 1e0db58e9..0369fdbea 100644 --- a/manifests/certmonger/ca/crl.pp +++ b/manifests/certmonger/ca/crl.pp @@ -107,8 +107,8 @@ class tripleo::certmonger::ca::crl ( creates => $fetched_crl, tries => 5, try_sleep => 5, - } ~> - file {'tripleo-ca-crl-file': + } + ~> file {'tripleo-ca-crl-file': group => 'root', mode => '0644', owner => 'root', diff --git a/manifests/profile/base/nova/conductor.pp b/manifests/profile/base/nova/conductor.pp index a152e15be..f105950b1 100644 --- a/manifests/profile/base/nova/conductor.pp +++ b/manifests/profile/base/nova/conductor.pp @@ -23,6 +23,10 @@ # for more details. # Defaults to hiera('step') # +# [*bootstrap_node*] +# (Optional) The hostname of the node responsible for bootstrapping tasks +# Defaults to hiera('nova_api_short_bootstrap_node_name') +# class tripleo::profile::base::nova::conductor ( $bootstrap_node = hiera('nova_api_short_bootstrap_node_name', undef), $step = Integer(hiera('step')), diff --git a/manifests/profile/base/tuned.pp b/manifests/profile/base/tuned.pp index 089e5fb91..8de651fb9 100644 --- a/manifests/profile/base/tuned.pp +++ b/manifests/profile/base/tuned.pp @@ -23,12 +23,12 @@ class tripleo::profile::base::tuned ( owner => 'root', group => 'root', mode => '0755', - } -> - file { "/etc/tuned/${profile}/tuned.conf": - before => Exec['tuned-adm'], + } + -> file { "/etc/tuned/${profile}/tuned.conf": ensure => present, - owner => 'root', - group => 'root', + before => Exec['tuned-adm'], + owner => 'root', + group => 'root', mode => '0644', content => $custom_profile, } diff --git a/manifests/ui.pp b/manifests/ui.pp index 185943365..53c5d6796 100644 --- a/manifests/ui.pp +++ b/manifests/ui.pp @@ -151,9 +151,9 @@ class tripleo::ui ( fallbackresource => '/index.html', proxy_pass => [ { - 'path' => '/zaqar', - 'url' => $endpoint_proxy_zaqar, - 'params' => { 'disablereuse' => 'On' } + 'path' => '/zaqar', + 'url' => $endpoint_proxy_zaqar, + 'params' => { 'disablereuse' => 'On' } }, { 'path' => '/keystone',