Yuvipanda has submitted this change and it was merged.
Change subject: labs: Remove explicitly set apt timeout
......................................................................
labs: Remove explicitly set apt timeout
This was added to prevent apt-get update timing out too soon
from causing puppet failures. Now apt-get update is run before
puppet, and hence this is not needed.
Change-Id: I0f3eee7f4e1228ca83051039476bd449b6569616
---
M manifests/role/labs.pp
1 file changed, 0 insertions(+), 6 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
coren: Looks good to me, but someone else must approve
Faidon Liambotis: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 36ced47..28121b0 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -169,10 +169,4 @@
# It needs to know project/hostname for nova access.
notify{"instanceproject: ${::instanceproject}":}
notify{"hostname: ${::instancename}":}
-
- apt::conf { 'labs-timeout':
- priority => '98',
- key => 'Acquire::http::Timeout',
- value => '300',
- }
}
--
To view, visit https://gerrit.wikimedia.org/r/183505
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0f3eee7f4e1228ca83051039476bd449b6569616
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[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
