Skip to content

Commit

Permalink
Merge pull request voxpupuli#756 from vrtdev/feature/fix_all_lint_war…
Browse files Browse the repository at this point in the history
…nings

Correct all arrow alignments using puppet-lint
  • Loading branch information
jhoblitt authored May 10, 2017
2 parents 822dd4a + 7873c46 commit 42f4fea
Show file tree
Hide file tree
Showing 12 changed files with 71 additions and 71 deletions.
6 changes: 3 additions & 3 deletions manifests/cli.pp
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
# As an attempt to preserve backwards compatibility, there are includes and
# resource relationships being scattered throughout this module.
if $::jenkins::manage_service {
Class['jenkins::service'] ->
Class['jenkins::cli'] ->
Anchor['jenkins::end']
Class['jenkins::service']
-> Class['jenkins::cli']
-> Anchor['jenkins::end']
}

$jar = "${jenkins::libdir}/jenkins-cli.jar"
Expand Down
6 changes: 3 additions & 3 deletions manifests/cli/exec.pp
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
include ::jenkins::cli_helper
include ::jenkins::cli::reload

Class['jenkins::cli_helper'] ->
Jenkins::Cli::Exec[$title] ->
Anchor['jenkins::end']
Class['jenkins::cli_helper']
-> Jenkins::Cli::Exec[$title]
-> Anchor['jenkins::end']

# $command may be either a string or an array due to the use of flatten()
$run = join(
Expand Down
6 changes: 3 additions & 3 deletions manifests/cli_helper.pp
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@

if $ssh_keyfile { validate_absolute_path($ssh_keyfile) }

Class['jenkins::cli'] ->
Class['jenkins::cli_helper'] ->
Anchor['jenkins::end']
Class['jenkins::cli']
-> Class['jenkins::cli_helper']
-> Anchor['jenkins::end']

$libdir = $::jenkins::libdir
$cli_jar = $::jenkins::cli::jar
Expand Down
6 changes: 3 additions & 3 deletions manifests/credentials.pp
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
include ::jenkins
include ::jenkins::cli_helper

Class['jenkins::cli_helper'] ->
Jenkins::Credentials[$title] ->
Anchor['jenkins::end']
Class['jenkins::cli_helper']
-> Jenkins::Credentials[$title]
-> Anchor['jenkins::end']

case $ensure {
'present': {
Expand Down
54 changes: 27 additions & 27 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -412,9 +412,9 @@
unless => "[ \$(\$HELPER_CMD get_num_executors) -eq ${executors} ]",
}

Class['jenkins::cli'] ->
Jenkins::Cli::Exec['set_num_executors'] ->
Class['jenkins::jobs']
Class['jenkins::cli']
-> Jenkins::Cli::Exec['set_num_executors']
-> Class['jenkins::jobs']
}

if ($slaveagentport != undef) {
Expand All @@ -423,39 +423,39 @@
unless => "[ \$(\$HELPER_CMD get_slaveagent_port) -eq ${slaveagentport} ]",
}

Class['jenkins::cli'] ->
Jenkins::Cli::Exec['set_slaveagent_port'] ->
Class['jenkins::jobs']
Class['jenkins::cli']
-> Jenkins::Cli::Exec['set_slaveagent_port']
-> Class['jenkins::jobs']
}

if $manage_service {
Anchor['jenkins::begin'] ->
Class[$jenkins_package_class] ->
Class['jenkins::config'] ->
Class['jenkins::plugins'] ~>
Class['jenkins::service'] ->
Class['jenkins::jobs'] ->
Anchor['jenkins::end']
Anchor['jenkins::begin']
-> Class[$jenkins_package_class]
-> Class['jenkins::config']
-> Class['jenkins::plugins']
~> Class['jenkins::service']
-> Class['jenkins::jobs']
-> Anchor['jenkins::end']
}

if $install_java {
Anchor['jenkins::begin'] ->
Class['java'] ->
Class[$jenkins_package_class] ->
Anchor['jenkins::end']
Anchor['jenkins::begin']
-> Class['java']
-> Class[$jenkins_package_class]
-> Anchor['jenkins::end']
}

if $repo_ {
Anchor['jenkins::begin'] ->
Class['jenkins::repo'] ->
Class['jenkins::package'] ->
Anchor['jenkins::end']
Anchor['jenkins::begin']
-> Class['jenkins::repo']
-> Class['jenkins::package']
-> Anchor['jenkins::end']
}

if ($configure_firewall and $manage_service) {
Class['jenkins::service'] ->
Class['jenkins::firewall'] ->
Anchor['jenkins::end']
Class['jenkins::service']
-> Class['jenkins::firewall']
-> Anchor['jenkins::end']
}

if $service_provider == 'systemd' {
Expand All @@ -466,9 +466,9 @@

# jenkins::config manages the jenkins user resource, which is autorequired
# by the file resource for the run wrapper.
Class['jenkins::config'] ->
Jenkins::Systemd['jenkins'] ->
Anchor['jenkins::end']
Class['jenkins::config']
-> Jenkins::Systemd['jenkins']
-> Anchor['jenkins::end']
}
}
# vim: ts=2 et sw=2 autoindent
6 changes: 3 additions & 3 deletions manifests/job.pp
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@

include ::jenkins::cli

Class['jenkins::cli'] ->
Jenkins::Job[$title] ->
Anchor['jenkins::end']
Class['jenkins::cli']
-> Jenkins::Job[$title]
-> Anchor['jenkins::end']

if ($ensure == 'absent') {
jenkins::job::absent { $title:
Expand Down
6 changes: 3 additions & 3 deletions manifests/proxy.pp
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
mode => '0644',
}

Package['jenkins'] ->
File[$proxy_xml] ~>
Service['jenkins']
Package['jenkins']
-> File[$proxy_xml]
~> Service['jenkins']

} else {
$url = undef
Expand Down
18 changes: 9 additions & 9 deletions manifests/repo.pp
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@

'RedHat', 'Linux': {
class { '::jenkins::repo::el': }
Anchor['jenkins::repo::begin'] ->
Class['jenkins::repo::el'] ->
Anchor['jenkins::repo::end']
Anchor['jenkins::repo::begin']
-> Class['jenkins::repo::el']
-> Anchor['jenkins::repo::end']
}

'Debian': {
class { '::jenkins::repo::debian': }
Anchor['jenkins::repo::begin'] ->
Class['jenkins::repo::debian'] ->
Anchor['jenkins::repo::end']
Anchor['jenkins::repo::begin']
-> Class['jenkins::repo::debian']
-> Anchor['jenkins::repo::end']
}

'Suse' : {
class { '::jenkins::repo::suse': }
Anchor['jenkins::repo::begin'] ->
Class['jenkins::repo::suse'] ->
Anchor['jenkins::repo::end']
Anchor['jenkins::repo::begin']
-> Class['jenkins::repo::suse']
-> Anchor['jenkins::repo::end']
}

default: {
Expand Down
6 changes: 3 additions & 3 deletions manifests/repo/debian.pp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
}
}

anchor { 'jenkins::repo::debian::begin': } ->
Apt::Source['jenkins'] ->
anchor { 'jenkins::repo::debian::end': }
anchor { 'jenkins::repo::debian::begin': }
-> Apt::Source['jenkins']
-> anchor { 'jenkins::repo::debian::end': }
}
6 changes: 3 additions & 3 deletions manifests/security.pp
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@

include ::jenkins::cli_helper

Class['jenkins::cli_helper'] ->
Class['jenkins::security'] ->
Anchor['jenkins::end']
Class['jenkins::cli_helper']
-> Class['jenkins::security']
-> Anchor['jenkins::end']

# XXX not idempotent
jenkins::cli::exec { "jenkins-security-${security_model}":
Expand Down
16 changes: 8 additions & 8 deletions manifests/slave.pp
Original file line number Diff line number Diff line change
Expand Up @@ -278,14 +278,14 @@
mode => '0644',
owner => 'root',
group => 'wheel',
} ->
Service['jenkins-slave']
}
-> Service['jenkins-slave']

file { '/var/log/jenkins':
ensure => 'directory',
owner => $slave_user,
} ->
Service['jenkins-slave']
}
-> Service['jenkins-slave']

if $manage_slave_user {
# osx doesn't have managehome support, so create directory
Expand Down Expand Up @@ -330,8 +330,8 @@
proxy_server => $proxy_server,
cleanup => false,
extract => false,
} ->
Service['jenkins-slave']
}
-> Service['jenkins-slave']
}

service { 'jenkins-slave':
Expand All @@ -343,7 +343,7 @@
}

if $manage_slave_user and $manage_client_jar {
User['jenkins-slave_user']->
Archive['get_swarm_client']
User['jenkins-slave_user']
-> Archive['get_swarm_client']
}
}
6 changes: 3 additions & 3 deletions manifests/user.pp
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@

include ::jenkins::cli_helper

Class['jenkins::cli_helper'] ->
Jenkins::User[$title] ->
Anchor['jenkins::end']
Class['jenkins::cli_helper']
-> Jenkins::User[$title]
-> Anchor['jenkins::end']

case $ensure {
'present': {
Expand Down

0 comments on commit 42f4fea

Please sign in to comment.