Akosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/96782
Change subject: Renaming role::haproxy to role::puppetproxy
......................................................................
Renaming role::haproxy to role::puppetproxy
To make clear the intention since haproxy could be used for other uses
as well. Minor cleanup as well
Change-Id: Id478b452618816f47903ad8298605623fb482255
---
M manifests/role/haproxy.pp
M manifests/site.pp
M modules/haproxy/templates/haproxy.cfg.erb
3 files changed, 7 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/82/96782/1
diff --git a/manifests/role/haproxy.pp b/manifests/role/haproxy.pp
index 508dbf2..9e5fb62 100644
--- a/manifests/role/haproxy.pp
+++ b/manifests/role/haproxy.pp
@@ -1,6 +1,8 @@
-class role::haproxy{
+class role::puppetproxy {
- system::role { 'haproxy': description => 'haproxy host' }
+ system::role { 'puppetproxy':
+ description => 'Puppet proxying through haproxy host',
+ }
class { 'haproxy':
endpoint_hostname => 'palladium',
diff --git a/manifests/site.pp b/manifests/site.pp
index 42e1237..0613fbf 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -308,8 +308,8 @@
backup::client
# set up brewster to use haproxy to proxy puppet
- # to palladium.
- include role::haproxy
+ # to palladium.
+ include role::puppetproxy
}
node "calcium.wikimedia.org" {
diff --git a/modules/haproxy/templates/haproxy.cfg.erb
b/modules/haproxy/templates/haproxy.cfg.erb
index 3813616..9edebf3 100644
--- a/modules/haproxy/templates/haproxy.cfg.erb
+++ b/modules/haproxy/templates/haproxy.cfg.erb
@@ -28,5 +28,5 @@
bind :8140
mode tcp
balance roundrobin
- server <%= @endpoint_hostname %> <%= @endpoint_ip %>
+ server <%= @endpoint_hostname %> <%= @endpoint_ip %>
acl esams src 91.198.174.0/24
--
To view, visit https://gerrit.wikimedia.org/r/96782
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id478b452618816f47903ad8298605623fb482255
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Akosiaris <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
