Andrew Bogott has submitted this change and it was merged.
Change subject: labs_vmbuilder: resource attributes quoting
......................................................................
labs_vmbuilder: resource attributes quoting
bug: T91908
Change-Id: Icab204a958f12acb8974e57ec37eb1cd0c58d004
---
M modules/labs_vmbuilder/manifests/init.pp
1 file changed, 8 insertions(+), 8 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/labs_vmbuilder/manifests/init.pp
b/modules/labs_vmbuilder/manifests/init.pp
index d656945..2d6a778 100644
--- a/modules/labs_vmbuilder/manifests/init.pp
+++ b/modules/labs_vmbuilder/manifests/init.pp
@@ -1,6 +1,6 @@
class labs_vmbuilder($vmbuilder_version) {
package { 'python-vm-builder':
- ensure => present,
+ ensure => 'present',
}
$vmbuilder_filepath = '/etc/vmbuilder/files'
@@ -30,7 +30,7 @@
}
file { $vmbuilder_filepath:
- ensure => directory,
+ ensure => 'directory',
mode => '0555',
}
@@ -60,34 +60,34 @@
}
$projectregex = "s/${instanceproject}/_PROJECT_/g"
- $fqdnregex = "s/${::ec2id}.${::domain}/_FQDN_/g"
- $masterregex = "s/${servername}/_MASTER_/g"
+ $fqdnregex = "s/${::ec2id}.${::domain}/_FQDN_/g"
+ $masterregex = "s/${servername}/_MASTER_/g"
Exec { path => '/bin' }
exec { "cp /etc/security/access.conf ${vmbuilder_filepath}/access.conf":
- subscribe => File['vmbuilder_version'],
+ subscribe => File['vmbuilder_version'],
} ~>
exec { "sed -i '${projectregex}' ${vmbuilder_filepath}/access.conf":
}
exec { "cp /etc/nslcd.conf ${vmbuilder_filepath}/nslcd.conf":
- subscribe => File['vmbuilder_version'],
+ subscribe => File['vmbuilder_version'],
} ~>
exec { "sed -i '${projectregex}' ${vmbuilder_filepath}/nslcd.conf":
}
exec { "cp /etc/ldap/ldap.conf ${vmbuilder_filepath}/nss_ldap.conf":
- subscribe => File['vmbuilder_version'],
+ subscribe => File['vmbuilder_version'],
} ~>
exec { "sed -i '${projectregex}' ${vmbuilder_filepath}/nss_ldap.conf":
}
exec { "cp /etc/puppet/puppet.conf ${vmbuilder_filepath}/puppet.conf":
- subscribe => File['vmbuilder_version'],
+ subscribe => File['vmbuilder_version'],
} ~>
exec { "sed -i '${projectregex}' ${vmbuilder_filepath}/puppet.conf":
--
To view, visit https://gerrit.wikimedia.org/r/195764
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icab204a958f12acb8974e57ec37eb1cd0c58d004
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
