Rush has submitted this change and it was merged.
Change subject: toollabs bastions install cgroup-bin
......................................................................
toollabs bastions install cgroup-bin
Bug: T131541
Change-Id: I8e3220b64aaa493729659bde386a6222d5239146
---
M modules/toollabs/manifests/bastion.pp
1 file changed, 17 insertions(+), 14 deletions(-)
Approvals:
Rush: Verified; Looks good to me, approved
diff --git a/modules/toollabs/manifests/bastion.pp
b/modules/toollabs/manifests/bastion.pp
index 4b00f7f..f67dbdc 100644
--- a/modules/toollabs/manifests/bastion.pp
+++ b/modules/toollabs/manifests/bastion.pp
@@ -16,22 +16,29 @@
include toollabs::dev_environ
include toollabs::exec_environ
+ if $::operatingsystem == 'Ubuntu' {
+ package { 'cgroup-bin':
+ ensure => present,
+ }
+ }
+
+ package { [
+ 'toollabs-webservice',
+ 'mosh']:
+ ensure => present,
+ }
+
+ motd::script { 'bastion-banner':
+ ensure => present,
+ source =>
"puppet:///modules/toollabs/40-${::labsproject}-bastion-banner",
+ }
+
file { '/etc/ssh/ssh_config':
ensure => file,
mode => '0444',
owner => 'root',
group => 'root',
source => 'puppet:///modules/toollabs/submithost-ssh_config',
- }
-
- # webservice-new command
- package { 'toollabs-webservice':
- ensure => latest,
- }
-
- motd::script { 'bastion-banner':
- ensure => present,
- source =>
"puppet:///modules/toollabs/40-${::labsproject}-bastion-banner",
}
file { "${toollabs::store}/submithost-${::fqdn}":
@@ -43,10 +50,6 @@
content => "${::ipaddress}\n",
}
- # Because it rocks
- package { 'mosh':
- ensure => present,
- }
# Display tips.
file { '/etc/profile.d/motd-tips.sh':
ensure => absent,
--
To view, visit https://gerrit.wikimedia.org/r/282072
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8e3220b64aaa493729659bde386a6222d5239146
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: Yuvipanda <[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
