Andrew Bogott has submitted this change and it was merged.
Change subject: Remove Ubuntu >= 12.04 conditionals for Labs
......................................................................
Remove Ubuntu >= 12.04 conditionals for Labs
We have no Lucid instances in Labs anymore and removing those
conditionals removes cruft and helps with Debian support.
Change-Id: Iea10087adab22428726581a3bb89868fdb37b67e
---
M manifests/role/labsbastion.pp
M modules/ldap/templates/nslcd.conf.erb
M modules/ssh/manifests/server.pp
3 files changed, 6 insertions(+), 16 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/labsbastion.pp b/manifests/role/labsbastion.pp
index 73ffb55..f7c420a 100644
--- a/manifests/role/labsbastion.pp
+++ b/manifests/role/labsbastion.pp
@@ -12,9 +12,7 @@
}
}
- if versioncmp($::lsbdistrelease, '12.04') >= 0 {
- package { 'mosh':
- ensure => present,
- }
+ package { 'mosh':
+ ensure => present,
}
}
diff --git a/modules/ldap/templates/nslcd.conf.erb
b/modules/ldap/templates/nslcd.conf.erb
index d5619a6..3b0f25e 100644
--- a/modules/ldap/templates/nslcd.conf.erb
+++ b/modules/ldap/templates/nslcd.conf.erb
@@ -38,12 +38,10 @@
tls_cacertfile /etc/ssl/certs/<%= @ldapconfig["ca"] %>
-<% if scope.function_versioncmp([@lsbdistrelease, "12.04"]) >= 0 %># Limit
user names to this regex. This needs to be kept in sync with OpenStackManager's
regex.
-validnames /^[a-z][.a-z0-9_-]*$/i<% end %>
+# Limit user names to this regex. This needs to be kept in sync with
OpenStackManager's regex.
+validnames /^[a-z][.a-z0-9_-]*$/i
-# Group mapping for sudo-ldap.
-<% if scope.function_versioncmp([@lsbdistrelease, "12.04"]) < 0 %>map group
uniquemember member<% end %>
<% if @realm == "labs" %>map passwd loginshell "/bin/bash"<% end %>
pagesize <%= @ldapconfig["pagesize"] %>
-<% if scope.function_versioncmp([@lsbdistrelease, "12.04"]) >= 0 %>nss_min_uid
<%= @ldapconfig["nss_min_uid"] %><% end %>
+nss_min_uid <%= @ldapconfig["nss_min_uid"] %>
diff --git a/modules/ssh/manifests/server.pp b/modules/ssh/manifests/server.pp
index c630b11..501d6c7 100644
--- a/modules/ssh/manifests/server.pp
+++ b/modules/ssh/manifests/server.pp
@@ -13,13 +13,7 @@
}
if ($::realm == 'labs') {
- if versioncmp($::lsbdistrelease, '12.04') >= 0 {
- $ssh_authorized_keys_file
='/etc/ssh/userkeys/%u/.ssh/authorized_keys
/public/keys/%u/.ssh/authorized_keys'
- } else {
- $ssh_authorized_keys_file
='/etc/ssh/userkeys/%u/.ssh/authorized_keys'
- $ssh_authorized_keys_file2 = '/public/keys/%u/.ssh/authorized_keys'
-
- }
+ $ssh_authorized_keys_file ='/etc/ssh/userkeys/%u/.ssh/authorized_keys
/public/keys/%u/.ssh/authorized_keys'
}
# publish this hosts's host key
--
To view, visit https://gerrit.wikimedia.org/r/179086
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iea10087adab22428726581a3bb89868fdb37b67e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[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
