Jcrespo has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/337834 )
Change subject: HAProxy: move templates under the role
......................................................................
HAProxy: move templates under the role
The templates subdir is deprecated, move the database proxy
configuration under the haproxy role.
Change-Id: I369cf2f6b4c5c6c1f55abd82a350e3ae322b85c8
---
M modules/role/manifests/mariadb.pp
R modules/role/templates/haproxy/db-master.cfg.erb
R modules/role/templates/haproxy/db-slaves.cfg.erb
R modules/role/templates/haproxy/db.cfg.erb
4 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Jcrespo: Verified; Looks good to me, approved
diff --git a/modules/role/manifests/mariadb.pp
b/modules/role/manifests/mariadb.pp
index e2984ab..769a00d 100644
--- a/modules/role/manifests/mariadb.pp
+++ b/modules/role/manifests/mariadb.pp
@@ -868,7 +868,7 @@
}
class { 'haproxy':
- template => 'mariadb/haproxy.cfg.erb',
+ template => 'role/haproxy/db.cfg.erb',
}
}
@@ -890,7 +890,7 @@
owner => 'root',
group => 'root',
mode => '0444',
- content => template('mariadb/haproxy-master.cfg.erb'),
+ content => template('role/haproxy/db-master.cfg.erb'),
}
nrpe::monitor_service { 'haproxy_failover':
@@ -912,7 +912,7 @@
owner => 'root',
group => 'root',
mode => '0444',
- content => template('mariadb/haproxy-slaves.cfg.erb'),
+ content => template('role/haproxy/db-slaves.cfg.erb'),
}
}
diff --git a/templates/mariadb/haproxy-master.cfg.erb
b/modules/role/templates/haproxy/db-master.cfg.erb
similarity index 100%
rename from templates/mariadb/haproxy-master.cfg.erb
rename to modules/role/templates/haproxy/db-master.cfg.erb
diff --git a/templates/mariadb/haproxy-slaves.cfg.erb
b/modules/role/templates/haproxy/db-slaves.cfg.erb
similarity index 100%
rename from templates/mariadb/haproxy-slaves.cfg.erb
rename to modules/role/templates/haproxy/db-slaves.cfg.erb
diff --git a/templates/mariadb/haproxy.cfg.erb
b/modules/role/templates/haproxy/db.cfg.erb
similarity index 100%
rename from templates/mariadb/haproxy.cfg.erb
rename to modules/role/templates/haproxy/db.cfg.erb
--
To view, visit https://gerrit.wikimedia.org/r/337834
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I369cf2f6b4c5c6c1f55abd82a350e3ae322b85c8
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <[email protected]>
Gerrit-Reviewer: Jcrespo <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
