Dzahn has submitted this change and it was merged. Change subject: openstack: some more lint fixes ......................................................................
openstack: some more lint fixes http://puppet-compiler.wmflabs.org/1156/ Change-Id: I4707f12653df9100f56d7327244cdde725728667 --- M modules/openstack/manifests/controller_firewall.pp M modules/openstack/manifests/designate/service.pp M modules/openstack/manifests/glance/service.pp M modules/openstack/manifests/nova/compute.pp M modules/openstack/manifests/repo.pp 5 files changed, 13 insertions(+), 9 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/openstack/manifests/controller_firewall.pp b/modules/openstack/manifests/controller_firewall.pp index 32a5967..89c0bbf 100644 --- a/modules/openstack/manifests/controller_firewall.pp +++ b/modules/openstack/manifests/controller_firewall.pp @@ -81,13 +81,13 @@ ferm::service { 'mysql_iron': proto => 'tcp', port => '3306', - srange => "@resolve(iron.wikimedia.org)", + srange => '@resolve(iron.wikimedia.org)', } # mysql monitoring access from tendril (db1011) ferm::service { 'mysql_tendril': proto => 'tcp', port => '3306', - srange => "@resolve(tendril.wikimedia.org)", + srange => '@resolve(tendril.wikimedia.org)', } } diff --git a/modules/openstack/manifests/designate/service.pp b/modules/openstack/manifests/designate/service.pp index ad5e534..fb5894e 100644 --- a/modules/openstack/manifests/designate/service.pp +++ b/modules/openstack/manifests/designate/service.pp @@ -141,7 +141,9 @@ base::service_unit { ['designate-pool-manager', 'designate-mdns']: upstart => true, require => Package['designate'], - service_params => { ensure => stopped }, + service_params => { + ensure => stopped + }, } } } diff --git a/modules/openstack/manifests/glance/service.pp b/modules/openstack/manifests/glance/service.pp index c390ecb..2c90166 100644 --- a/modules/openstack/manifests/glance/service.pp +++ b/modules/openstack/manifests/glance/service.pp @@ -70,8 +70,8 @@ } ssh::userkey { 'glancesync': - require => User['glancesync'], ensure => present, + require => User['glancesync'], content => secret('ssh/glancesync/glancesync.pub'), } file { '/home/glancesync/.ssh': @@ -125,9 +125,9 @@ require => Package['glance'], } cron { 'rsync_chown_images': - command => "chown -R glance ${image_datadir}/*", - minute => 30, - user => 'root', + command => "chown -R glance ${image_datadir}/*", + minute => 30, + user => 'root', } } } diff --git a/modules/openstack/manifests/nova/compute.pp b/modules/openstack/manifests/nova/compute.pp index 1c84e77..668c6bd 100644 --- a/modules/openstack/manifests/nova/compute.pp +++ b/modules/openstack/manifests/nova/compute.pp @@ -44,8 +44,8 @@ # T116332 nrpe::monitor_service { 'kvm_ssl_cert': - description => 'kvm ssl cert', - nrpe_command => "/usr/local/lib/nagios/plugins/check_ssl_certfile /etc/ssl/localcerts/${certname}.crt", + description => 'kvm ssl cert', + nrpe_command => "/usr/local/lib/nagios/plugins/check_ssl_certfile /etc/ssl/localcerts/${certname}.crt", } file { '/var/lib/nova/cacert.pem': diff --git a/modules/openstack/manifests/repo.pp b/modules/openstack/manifests/repo.pp index b6e8b13..566be29 100644 --- a/modules/openstack/manifests/repo.pp +++ b/modules/openstack/manifests/repo.pp @@ -10,7 +10,9 @@ uri => 'http://ubuntu-cloud.archive.canonical.com/ubuntu', dist => "trusty-updates/${openstack_version}", components => 'main', + # lint:ignore:puppet_url_without_modules keyfile => 'puppet:///files/misc/ubuntu-cloud.key'; + # lint:endignore } } } -- To view, visit https://gerrit.wikimedia.org/r/250064 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4707f12653df9100f56d7327244cdde725728667 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Yuvipanda <yuvipa...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
