ArielGlenn has submitted this change and it was merged.
Change subject: formey: decom
......................................................................
formey: decom
RT #6134
Change-Id: I7fd20074db4d5e7ee8cbe37494a1f7ed755a4fcb
---
M files/dsh/group/misc_pmtpa
M files/dsh/group/pmtpa
M manifests/admins.pp
M manifests/site.pp
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
5 files changed, 2 insertions(+), 19 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/dsh/group/misc_pmtpa b/files/dsh/group/misc_pmtpa
index cffd7a8..c4b5e3f 100644
--- a/files/dsh/group/misc_pmtpa
+++ b/files/dsh/group/misc_pmtpa
@@ -1,7 +1,6 @@
dobson
ekrem
fenari
-formey
linne
manutius
mchenry
diff --git a/files/dsh/group/pmtpa b/files/dsh/group/pmtpa
index c315f27..ff782fa 100644
--- a/files/dsh/group/pmtpa
+++ b/files/dsh/group/pmtpa
@@ -1,6 +1,5 @@
dobson
fenari
-formey
linne
mchenry
sanger
diff --git a/manifests/admins.pp b/manifests/admins.pp
index 535d261..33c27bb 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -6,7 +6,7 @@
# NOTE: To choose the UID for a new user please lookup
# the existing UID in (labs) LDAP and use that.
-# currently you do this on formey, example:
+# currently you do this on silver, example:
#
# ldaplist -l passwd someuser
# ...
@@ -3911,7 +3911,7 @@
}
# permissions and users for LDAP operations
-# (formerly in site.pp directly in node formey)
+# (silver in site.pp directly in node silver)
class admins::ldap {
$sudo_privs = [
diff --git a/manifests/site.pp b/manifests/site.pp
index 5a8608a..4c2033f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -978,16 +978,6 @@
}
-node 'formey.wikimedia.org' {
-
- include standard
- include webserver::php5
- include backup::client
- include role::deployment::test
- include role::ldap::operations
-
-}
-
# gadolinium is the webrequest socat multicast relay.
# base_analytics_logging_node is defined in role/logging.pp
node 'gadolinium.wikimedia.org' inherits 'base_analytics_logging_node' {
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
index 8fc6e0b..8be2ca3 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
@@ -18,11 +18,6 @@
fixed-address fenari.wikimedia.org;
}
-host formey {
- hardware ethernet A4:BA:DB:0A:44:E4;
- fixed-address formey.wikimedia.org;
-}
-
host linne {
hardware ethernet 00:1e:c9:ea:ab:a7;
fixed-address linne.wikimedia.org;
--
To view, visit https://gerrit.wikimedia.org/r/126976
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7fd20074db4d5e7ee8cbe37494a1f7ed755a4fcb
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
