Jcrespo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/399350 )

Change subject: dbproxy: Fix dbproxy1005 and prepare dbproxy1007 for reimage
......................................................................

dbproxy: Fix dbproxy1005 and prepare dbproxy1007 for reimage

On stretch (haproxy >= 1.7), mysql hosts have to explicitly set the
port.

Remove old socket locations on dbproxy1007.

Bug: T183249
Change-Id: I3d8fd021286641ca462e33eb2a692a973c5c0c7e
---
M hieradata/hosts/dbproxy1005.yaml
M hieradata/hosts/dbproxy1007.yaml
2 files changed, 4 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/50/399350/1

diff --git a/hieradata/hosts/dbproxy1005.yaml b/hieradata/hosts/dbproxy1005.yaml
index c7d9c33..995143a 100644
--- a/hieradata/hosts/dbproxy1005.yaml
+++ b/hieradata/hosts/dbproxy1005.yaml
@@ -1,5 +1,5 @@
 profile::mariadb::proxy::master::primary_name: 'db1009'
-profile::mariadb::proxy::master::primary_addr: '10.64.0.13'
+profile::mariadb::proxy::master::primary_addr: '10.64.0.13:3306'
 profile::mariadb::proxy::master::secondary_name: 'db2030'
-profile::mariadb::proxy::master::secondary_addr: '10.192.16.18'
+profile::mariadb::proxy::master::secondary_addr: '10.192.16.18:3306'
 profile::mariadb::proxy::firewall: 'cloud'
diff --git a/hieradata/hosts/dbproxy1007.yaml b/hieradata/hosts/dbproxy1007.yaml
index c31bd1d..586ba71 100644
--- a/hieradata/hosts/dbproxy1007.yaml
+++ b/hieradata/hosts/dbproxy1007.yaml
@@ -1,6 +1,4 @@
-profile::mariadb::proxy::pid: '/var/run/haproxy.pid'
-profile::mariadb::proxy::socket: '/tmp/haproxy.socket'
 profile::mariadb::proxy::master::primary_name: 'db1020'
-profile::mariadb::proxy::master::primary_addr: '10.64.16.9'
+profile::mariadb::proxy::master::primary_addr: '10.64.16.9:3306'
 profile::mariadb::proxy::master::secondary_name: 'db2011'
-profile::mariadb::proxy::master::secondary_addr: '10.192.0.14'
+profile::mariadb::proxy::master::secondary_addr: '10.192.0.14:3306'

-- 
To view, visit https://gerrit.wikimedia.org/r/399350
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d8fd021286641ca462e33eb2a692a973c5c0c7e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to