Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347834 )
Change subject: profile::conftool::client: accept protocol as a parameter
......................................................................
profile::conftool::client: accept protocol as a parameter
Change-Id: Id00e7a8f9197a7734bbb4b4f5e7fa731bf77c80a
---
M modules/profile/manifests/conftool/client.pp
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/profile/manifests/conftool/client.pp
b/modules/profile/manifests/conftool/client.pp
index 2b68d79..66b9e6b 100644
--- a/modules/profile/manifests/conftool/client.pp
+++ b/modules/profile/manifests/conftool/client.pp
@@ -16,6 +16,7 @@
$namespace = dirname(hiera('conftool_prefix')),
$tcpircbot_host = hiera('tcpircbot_host', 'icinga.wikimedia.org'),
$tcpircbot_port = hiera('tcpircbot_port', 9200),
+ $protocol = hiera('profile::conftool::client::protocol', 'https')
) {
require_package('python-conftool')
require ::passwords::etcd
@@ -24,7 +25,7 @@
srv_domain => $srv_domain,
host => $host,
port => $port,
- protocol => 'https',
+ protocol => $protocol,
}
::etcd::client::config { '/root/.etcdrc':
--
To view, visit https://gerrit.wikimedia.org/r/347834
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id00e7a8f9197a7734bbb4b4f5e7fa731bf77c80a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
