Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/315487
Change subject: (WIP) zuul role with hiera lookup (WIP)
......................................................................
(WIP) zuul role with hiera lookup (WIP)
Change-Id: I03282bdc3b78a34e7ee7e452b8bc364c790c3870
---
M modules/role/manifests/zuul/merger.pp
M modules/role/manifests/zuul/server.pp
2 files changed, 11 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/87/315487/1
diff --git a/modules/role/manifests/zuul/merger.pp
b/modules/role/manifests/zuul/merger.pp
index 6c38ac9..92fc010 100644
--- a/modules/role/manifests/zuul/merger.pp
+++ b/modules/role/manifests/zuul/merger.pp
@@ -4,26 +4,17 @@
include ::zuul::monitoring::merger
$conf_common = hiera_hash('zuul::common')
- $conf_merger = hiera_hash('zuul::merger')
class { '::zuul::merger':
# Shared settings
- gerrit_server => $conf_common['gerrit_server'],
- gerrit_user => $conf_common['gerrit_user'],
- url_pattern => $conf_common['url_pattern'],
- status_url => $conf_common['status_url'],
-
- # Merger related
- gearman_server => $conf_merger['gearman_server'],
- gerrit_ssh_key_file => $conf_merger['gerrit_ssh_key_file'],
- git_dir => $conf_merger['git_dir'],
- git_email => $conf_merger['git_email'],
- git_name => $conf_merger['git_name'],
- zuul_url => $conf_merger['zuul_url'],
+ gerrit_server => $conf_common['gerrit_server'],
+ gerrit_user => $conf_common['gerrit_user'],
+ url_pattern => $conf_common['url_pattern'],
+ status_url => $conf_common['status_url'],
}
# Serves Zuul git repositories
class { 'contint::zuul::git_daemon':
- zuul_git_dir => $conf_merger['git_dir'],
+ zuul_git_dir => $zuul::merger::git_dir,
}
# We run a git-daemon process to exposes the zuul-merger git repositories.
diff --git a/modules/role/manifests/zuul/server.pp
b/modules/role/manifests/zuul/server.pp
index c3075c5..a0231ed 100644
--- a/modules/role/manifests/zuul/server.pp
+++ b/modules/role/manifests/zuul/server.pp
@@ -9,21 +9,15 @@
$jenkins_apikey = $::passwords::misc::contint::jenkins::zuul_user_apikey
$conf_common = hiera_hash('zuul::common')
- $conf_server = hiera_hash('zuul::server')
class { '::zuul::server':
# Shared settings
- gerrit_server => $conf_common['gerrit_server'],
- gerrit_user => $conf_common['gerrit_user'],
- url_pattern => $conf_common['url_pattern'],
- status_url => $conf_common['status_url'],
+ gerrit_server => $conf_common['gerrit_server'],
+ gerrit_user => $conf_common['gerrit_user'],
+ url_pattern => $conf_common['url_pattern'],
+ status_url => $conf_common['status_url'],
# Server settings
- jenkins_apikey => $jenkins_apikey,
- gearman_server => $conf_server['gearman_server'],
- gearman_server_start => $conf_server['gearman_server_start'],
- jenkins_server => $conf_server['jenkins_server'],
- jenkins_user => $conf_server['jenkins_user'],
- statsd_host => $conf_server['statsd_host'],
+ jenkins_apikey => $jenkins_apikey,
}
# Deploy Wikimedia Zuul configuration files.
@@ -37,7 +31,7 @@
mode => '0775',
umask => '002',
origin => 'https://gerrit.wikimedia.org/r/p/integration/config.git',
- branch => $conf_server['config_git_branch'],
+ branch => $zuul::server::config_git_branch,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/315487
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I03282bdc3b78a34e7ee7e452b8bc364c790c3870
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
