openstack
/
puppet-tripleo
Code Issues Proposed changes

Fix linting issues 

https://review.openstack.org/624989 fixed the lint job and since it's
been broken for a while, we've got some linting issues.

Closes-Bug: #1808883
Change-Id: I3d5df4479cf05f4c4a81d37184e8225ea1478e26
This commit is contained in:
Alex Schultz 2018-12-17 17:00:33 -07:00
parent aa6a6e2cec
commit daa4710a0a
15 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/certmonger/ca/crl.pp
View File

@ -107,8 +107,7 @@ 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',

2
manifests/certmonger/qemu.pp
View File

@ -69,7 +69,7 @@ define tripleo::certmonger::qemu (
dnsname => $hostname,
principal => $principal,
postsave_cmd => $postsave_cmd_real,
ca => $certmonger_ca_qemu,
ca => $certmonger_ca,
cacertfile => $cacertfile,
wait => true,
tag => 'qemu-cert',

2
manifests/profile/base/cinder/volume/rbd.pp
View File

@ -59,7 +59,9 @@
class tripleo::profile::base::cinder::volume::rbd (
$backend_name = hiera('cinder::backend::rbd::volume_backend_name', 'tripleo_ceph'),
$backend_availability_zone = hiera('cinder::backend::rbd::backend_availability_zone', undef),
# lint:ignore:parameter_documentation
$cinder_rbd_backend_host = hiera('cinder::backend_host', hiera('cinder::host', $::hostname)),
# lint:endignore
$cinder_rbd_ceph_conf = hiera('cinder::backend::rbd::rbd_ceph_conf', '/etc/ceph/ceph.conf'),
$cinder_rbd_pool_name = 'volumes',
$cinder_rbd_extra_pools = undef,

4
manifests/profile/base/neutron.pp
View File

@ -115,10 +115,10 @@ class tripleo::profile::base::neutron (
if $step >= 3 {
# NOTE(bogdando) validate_* is deprecated and we do not want to use it here
if !($container_cli in ['docker', 'podman']) {
fail("container_cli ($container_cli) is not supported!")
fail("container_cli (${container_cli}) is not supported!")
}
if $container_cli == 'docker' {
warning("Docker runtime is deprecated. Consider switching container_cli to podman")
warning('Docker runtime is deprecated. Consider switching container_cli to podman')
}
$oslomsg_rpc_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_rpc_use_ssl)))
$oslomsg_notify_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_notify_use_ssl)))

2
manifests/profile/base/neutron/dhcp_agent_wrappers.pp
View File

@ -69,7 +69,7 @@ class tripleo::profile::base::neutron::dhcp_agent_wrappers (
) {
$container_cli = hiera('tripleo::profile::base::neutron::container_cli', 'docker')
if $bind_sockets and $container_cli == 'docker' {
warning("Docker runtime is deprecated. Consider switching container_cli to podman")
warning('Docker runtime is deprecated. Consider switching container_cli to podman')
$bind_socket = join(['unix://', $bind_sockets[0]], '')
} else {
$bind_socket = ''

2
manifests/profile/base/neutron/l3_agent_wrappers.pp
View File

@ -109,7 +109,7 @@ class tripleo::profile::base::neutron::l3_agent_wrappers (
) {
$container_cli = hiera('tripleo::profile::base::neutron::container_cli', 'docker')
if $bind_sockets and $container_cli == 'docker' {
warning("Docker runtime is deprecated. Consider switching container_cli to podman")
warning('Docker runtime is deprecated. Consider switching container_cli to podman')
$bind_socket = join(['unix://', $bind_sockets[0]], '')
} else {
$bind_socket = ''

2
manifests/profile/base/neutron/ovn_metadata_agent_wrappers.pp
View File

@ -52,7 +52,7 @@ class tripleo::profile::base::neutron::ovn_metadata_agent_wrappers (
) {
$container_cli = hiera('tripleo::profile::base::neutron::container_cli', 'docker')
if $bind_sockets and $container_cli == 'docker' {
warning("Docker runtime is deprecated. Consider switching container_cli to podman")
warning('Docker runtime is deprecated. Consider switching container_cli to podman')
$bind_socket = join(['unix://', $bind_sockets[0]], '')
} else {
$bind_socket = ''

8
manifests/profile/base/neutron/wrappers/dibbler_client.pp
View File

@ -36,14 +36,14 @@
define tripleo::profile::base::neutron::wrappers::dibbler_client (
$dibbler_process_wrapper,
$dibbler_image,
$bind_socket = undef,
Boolean $debug,
$container_cli,
$bind_socket = undef,
) {
file { $dibbler_process_wrapper:
ensure => file,
mode => '0755',
content => epp('tripleo/neutron/dibbler-client.epp', {
ensure => file,
mode => '0755',
content => epp('tripleo/neutron/dibbler-client.epp', {
'image_name' => $dibbler_image,
'bind_socket' => $bind_socket,
'debug' => $debug,

8
manifests/profile/base/neutron/wrappers/dnsmasq.pp
View File

@ -36,14 +36,14 @@
define tripleo::profile::base::neutron::wrappers::dnsmasq (
$dnsmasq_process_wrapper,
$dnsmasq_image,
$bind_socket = undef,
Boolean $debug,
$container_cli,
$bind_socket = undef,
) {
file { $dnsmasq_process_wrapper:
ensure => file,
mode => '0755',
content => epp('tripleo/neutron/dnsmasq.epp', {
ensure => file,
mode => '0755',
content => epp('tripleo/neutron/dnsmasq.epp', {
'image_name' => $dnsmasq_image,
'bind_socket' => $bind_socket,
'debug' => $debug,

8
manifests/profile/base/neutron/wrappers/haproxy.pp
View File

@ -36,14 +36,14 @@
define tripleo::profile::base::neutron::wrappers::haproxy (
$haproxy_process_wrapper,
$haproxy_image,
$bind_socket = undef,
Boolean $debug,
$container_cli,
$bind_socket = undef,
) {
file { $haproxy_process_wrapper:
ensure => file,
mode => '0755',
content => epp('tripleo/neutron/haproxy.epp', {
ensure => file,
mode => '0755',
content => epp('tripleo/neutron/haproxy.epp', {
'image_name' => $haproxy_image,
'bind_socket' => $bind_socket,
'debug' => $debug,

8
manifests/profile/base/neutron/wrappers/keepalived.pp
View File

@ -36,14 +36,14 @@
define tripleo::profile::base::neutron::wrappers::keepalived (
$keepalived_process_wrapper,
$keepalived_image,
$bind_socket = undef,
Boolean $debug,
$container_cli,
$bind_socket = undef,
) {
file { $keepalived_process_wrapper:
ensure => file,
mode => '0755',
content => epp('tripleo/neutron/keepalived.epp', {
ensure => file,
mode => '0755',
content => epp('tripleo/neutron/keepalived.epp', {
'image_name' => $keepalived_image,
'bind_socket' => $bind_socket,
'debug' => $debug,

8
manifests/profile/base/neutron/wrappers/keepalived_state_change.pp
View File

@ -32,14 +32,14 @@
#
define tripleo::profile::base::neutron::wrappers::keepalived_state_change (
$keepalived_state_change_wrapper,
$bind_socket = undef,
Boolean $debug,
$container_cli,
$bind_socket = undef,
) {
file { $keepalived_state_change_wrapper:
ensure => file,
mode => '0755',
content => epp('tripleo/neutron/neutron-keepalived-state-change.epp', {
ensure => file,
mode => '0755',
content => epp('tripleo/neutron/neutron-keepalived-state-change.epp', {
'bind_socket' => $bind_socket,
'debug' => $debug,
'container_cli' => $container_cli,

8
manifests/profile/base/neutron/wrappers/radvd.pp
View File

@ -37,14 +37,14 @@
define tripleo::profile::base::neutron::wrappers::radvd (
$radvd_process_wrapper,
$radvd_image,
$bind_socket = undef,
Boolean $debug,
$container_cli,
$bind_socket = undef,
) {
file { $radvd_process_wrapper:
ensure => file,
mode => '0755',
content => epp('tripleo/neutron/radvd.epp', {
ensure => file,
mode => '0755',
content => epp('tripleo/neutron/radvd.epp', {
'image_name' => $radvd_image,
'bind_socket' => $bind_socket,
'debug' => $debug,

9
manifests/profile/base/tuned.pp
View File

@ -23,12 +23,11 @@ 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,
}

6
manifests/ui.pp
View File

@ -169,9 +169,9 @@ class tripleo::ui (
],
proxy_pass => [
{
'path' => '/zaqar',
'url' => $endpoint_proxy_zaqar,
'params' => { 'disablereuse' => 'On' }
'path' => '/zaqar',
'url' => $endpoint_proxy_zaqar,
'params' => { 'disablereuse' => 'On' }
},
{
'path' => '/keystone',