[MediaWiki-commits] [Gerrit] operations/puppet[production]: conftool: get conf from class parameters

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: conftool: get conf from class parameters
..


conftool: get conf from class parameters

So hiera can be used to easily override values

Change-Id: I76610eb7205ab319ba1835397e2966fbc9adfffa
---
D modules/conftool/files/production.config.yaml
M modules/conftool/manifests/init.pp
2 files changed, 19 insertions(+), 14 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  Alexandros Kosiaris: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/conftool/files/production.config.yaml 
b/modules/conftool/files/production.config.yaml
deleted file mode 100644
index 0aed92b..000
--- a/modules/conftool/files/production.config.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-hosts:
-  - https://conf1001.eqiad.wmnet:2379
-  - https://conf1002.eqiad.wmnet:2379
-  - https://conf1003.eqiad.wmnet:2379
-driver_options:
-  allow_reconnect: true
-tcpircbot_host: neon.wikimedia.org
-tcpircbot_port: 9200
diff --git a/modules/conftool/manifests/init.pp 
b/modules/conftool/manifests/init.pp
index e2f670a..b27a084 100644
--- a/modules/conftool/manifests/init.pp
+++ b/modules/conftool/manifests/init.pp
@@ -4,11 +4,17 @@
 # a post-receive hook.
 
 class conftool(
-$config_file = 'puppet:///modules/conftool/production.config.yaml',
 $ssl_dir = '/var/lib/puppet/ssl',
 $use_ssl = true,
 $auth= true,
 $password= undef,
+$hosts   = [
+'https://conf1001.eqiad.wmnet:2379',
+'https://conf1002.eqiad.wmnet:2379',
+'https://conf1003.eqiad.wmnet:2379'
+],
+$tcpircbot_host = 'neon.wikimedia.org',
+$tcpircbot_port = 9200,
 ) {
 require_package('python-conftool')
 
@@ -22,11 +28,18 @@
 }
 
 file { '/etc/conftool/config.yaml':
-ensure => present,
-owner  => root,
-group  => root,
-mode   => '0444',
-source => $config_file,
+ensure  => present,
+owner   => root,
+group   => root,
+mode=> '0444',
+content => ordered_yaml({
+hosts  => $hosts,
+tcpircbot_host => $tcpircbot_host,
+tcpircbot_port => $tcpircbot_port,
+driver_options => {
+allow_reconnect => true
+}
+}),
 }
 
 if $auth {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I76610eb7205ab319ba1835397e2966fbc9adfffa
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: conftool: get conf from class parameters

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/310459

Change subject: conftool: get conf from class parameters
..

conftool: get conf from class parameters

So hiera can be used to easily override values

Change-Id: I76610eb7205ab319ba1835397e2966fbc9adfffa
---
D modules/conftool/files/production.config.yaml
M modules/conftool/manifests/init.pp
2 files changed, 19 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/59/310459/1

diff --git a/modules/conftool/files/production.config.yaml 
b/modules/conftool/files/production.config.yaml
deleted file mode 100644
index 0aed92b..000
--- a/modules/conftool/files/production.config.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-hosts:
-  - https://conf1001.eqiad.wmnet:2379
-  - https://conf1002.eqiad.wmnet:2379
-  - https://conf1003.eqiad.wmnet:2379
-driver_options:
-  allow_reconnect: true
-tcpircbot_host: neon.wikimedia.org
-tcpircbot_port: 9200
diff --git a/modules/conftool/manifests/init.pp 
b/modules/conftool/manifests/init.pp
index e2f670a..b27a084 100644
--- a/modules/conftool/manifests/init.pp
+++ b/modules/conftool/manifests/init.pp
@@ -4,11 +4,17 @@
 # a post-receive hook.
 
 class conftool(
-$config_file = 'puppet:///modules/conftool/production.config.yaml',
 $ssl_dir = '/var/lib/puppet/ssl',
 $use_ssl = true,
 $auth= true,
 $password= undef,
+$hosts   = [
+'https://conf1001.eqiad.wmnet:2379',
+'https://conf1002.eqiad.wmnet:2379',
+'https://conf1003.eqiad.wmnet:2379'
+],
+$tcpircbot_host = 'neon.wikimedia.org',
+$tcpircbot_port = 9200,
 ) {
 require_package('python-conftool')
 
@@ -22,11 +28,18 @@
 }
 
 file { '/etc/conftool/config.yaml':
-ensure => present,
-owner  => root,
-group  => root,
-mode   => '0444',
-source => $config_file,
+ensure  => present,
+owner   => root,
+group   => root,
+mode=> '0444',
+content => ordered_yaml({
+hosts  => $hosts,
+tcpircbot_host => $tcpircbot_host,
+tcpircbot_port => $tcpircbot_port,
+driver_options => {
+allow_reconnect => true
+}
+}),
 }
 
 if $auth {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76610eb7205ab319ba1835397e2966fbc9adfffa
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits