Tim Landscheidt has uploaded a new change for review. https://gerrit.wikimedia.org/r/114734
Change subject: Fix indentation in role::labs::instance ...................................................................... Fix indentation in role::labs::instance Change-Id: I5efc76f3014642e780aab62e85f23c9ae0f9a321 --- M manifests/role/labs.pp 1 file changed, 59 insertions(+), 27 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/34/114734/1 diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp index 2568a73..3b1dd28 100644 --- a/manifests/role/labs.pp +++ b/manifests/role/labs.pp @@ -1,11 +1,12 @@ - class role::labs::instance { include ldap::role::client::labs, - base::instance-upstarts + base::instance-upstarts # make common logs readable - class {'base::syslogs': readable => true } + class { 'base::syslogs': + readable => true + } # Directory for data mounts file { '/data': @@ -29,72 +30,104 @@ $nfs_server = 'labstore.svc.eqiad.wmnet' mount { '/home': - ensure => mounted, atboot => true, fstype => 'nfs', options => "rw,${nfs_opts}", - device => "${nfs_server}:/project/${instanceproject}/home", + ensure => mounted, + atboot => true, + fstype => 'nfs', + options => "rw,${nfs_opts}", + device => "${nfs_server}:/project/${instanceproject}/home", } file { '/data/project': - ensure => directory, owner => 'root', group => 'root', mode => '0755', + ensure => directory, + owner => 'root', + group => 'root', + mode => '0755', require => File['/data', '/etc/idmapd.conf'], } mount { '/data/project': - ensure => mounted, atboot => true, fstype => 'nfs', options => "rw,${nfs_opts}", - device => "${nfs_server}:/project/${instanceproject}/project", + ensure => mounted, + atboot => true, + fstype => 'nfs', + options => "rw,${nfs_opts}", + device => "${nfs_server}:/project/${instanceproject}/project", require => File['/data/project'], } file { '/data/scratch': - ensure => directory, owner => 'root', group => 'root', mode => '0755', + ensure => directory, + owner => 'root', + group => 'root', + mode => '0755', require => File['/data', '/etc/idmapd.conf'], } mount { '/data/scratch': - ensure => mounted, atboot => true, fstype => 'nfs', options => "rw,${nfs_opts}", - device => "${nfs_server}:/scratch", + ensure => mounted, + atboot => true, + fstype => 'nfs', + options => "rw,${nfs_opts}", + device => "${nfs_server}:/scratch", require => File['/data/scratch'], } file { '/public/dumps': - ensure => directory, owner => 'root', group => 'root', mode => '0755', + ensure => directory, + owner => 'root', + group => 'root', + mode => '0755', require => File['/public'], } mount { '/public/dumps': - ensure => mounted, atboot => true, fstype => 'nfs', options => "ro,${nfs_opts}", - device => "${nfs_server}:/dumps", + ensure => mounted, + atboot => true, + fstype => 'nfs', + options => "ro,${nfs_opts}", + device => "${nfs_server}:/dumps", require => File['/public/dumps'], } file { '/public/backups': - ensure => directory, owner => 'root', group => 'root', mode => '0755', + ensure => directory, + owner => 'root', + group => 'root', + mode => '0755', require => File['/public'], } mount { '/public/backups': - ensure => mounted, atboot => true, fstype => 'nfs', options => "ro,${nfs_opts}", - device => "${nfs_server}:/backups", + ensure => mounted, + atboot => true, + fstype => 'nfs', + options => "ro,${nfs_opts}", + device => "${nfs_server}:/backups", require => File['/public/backups'], } - file { '/public/keys': - ensure => directory, owner => 'root', group => 'root', mode => '0755', + ensure => directory, + owner => 'root', + group => 'root', + mode => '0755', require => File['/public'], } mount { '/public/keys': - ensure => mounted, atboot => true, fstype => 'nfs', options => "ro,${nfs_opts}", - device => "${nfs_server}:/keys", + ensure => mounted, + atboot => true, + fstype => 'nfs', + options => "ro,${nfs_opts}", + device => "${nfs_server}:/keys", require => File['/public/keys'], - notify => Service['ssh'], + notify => Service['ssh'], } service { 'idmapd': - ensure => running, + ensure => running, subscribe => File['/etc/idmapd.conf'], } file { '/etc/idmapd.conf': ensure => present, - owner => root, - group => root, - mode => 0444, + owner => root, + group => root, + mode => 0444, source => 'puppet:///files/nfs/idmapd.conf', } @@ -113,4 +146,3 @@ } } - -- To view, visit https://gerrit.wikimedia.org/r/114734 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5efc76f3014642e780aab62e85f23c9ae0f9a321 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits