Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235427
Change subject: nodepool: adjust database configuration
......................................................................
nodepool: adjust database configuration
A nodepooldb database has been created on m5-master.eqiad.wmnet. The
password is already in the private repo.
Bug: T110693
Change-Id: I0ae5e8ee9d725e84849ec32942972a98c260d382
---
M manifests/role/nodepool.pp
M modules/nodepool/manifests/init.pp
M modules/nodepool/templates/nodepool.yaml.erb
3 files changed, 21 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/27/235427/1
diff --git a/manifests/role/nodepool.pp b/manifests/role/nodepool.pp
index 905b7f2..7297c3a 100644
--- a/manifests/role/nodepool.pp
+++ b/manifests/role/nodepool.pp
@@ -14,6 +14,10 @@
$novaconfig = $role::nova::config::novaconfig
class { '::nodepool':
+ db_host => 'm5-master.eqiad.wmnet',
+ db_name => 'nodepooldb'
+ db_user => 'nodepool'
+ db_pass => $passwords::nodepool::nodepooldb_pass,
dib_base_path => '/srv/dib',
jenkins_api_user => 'nodepoolmanager',
jenkins_api_key => $passwords::nodepool::jenkins_api_key,
diff --git a/modules/nodepool/manifests/init.pp
b/modules/nodepool/manifests/init.pp
index abbfcc3..0df6287 100644
--- a/modules/nodepool/manifests/init.pp
+++ b/modules/nodepool/manifests/init.pp
@@ -6,6 +6,18 @@
#
# Parameters:
#
+# [*db_host*]
+# MySQL database backend hostname
+#
+# [*db_name*]
+# Database name on db_host
+#
+# [*db_user*]
+# Database backend username
+#
+# [*db_pass]
+# Database password associated to user db_user
+#
# [*dib_base_path*]
# Directory holding python-diskimagebuilder material. Will create
# subdirectories 'cache', 'images' and 'tmp'.
@@ -41,6 +53,10 @@
# [*openstack_tenant_id*]
# OpenStack tenant holding the instances. Equivalent of wmflabs 'project name'.
class nodepool(
+ $db_host,
+ $db_name,
+ $db_user,
+ $db_pass,
$dib_base_path,
$jenkins_api_user,
$jenkins_api_key,
diff --git a/modules/nodepool/templates/nodepool.yaml.erb
b/modules/nodepool/templates/nodepool.yaml.erb
index 8a7946d..4a196d9 100644
--- a/modules/nodepool/templates/nodepool.yaml.erb
+++ b/modules/nodepool/templates/nodepool.yaml.erb
@@ -1,5 +1,5 @@
# Nodepool database backend
-dburi: 'mysql+pymysql://nodepool:nodepool@localhost/nodepool'
+dburi: 'mysql+pymysql://<%= @db_user -%>:<%= @db_password -%>@<%= @db_host
-%>/<%= @db_name -%>'
# Directory providing additional diskimage-builder elements.
# http://docs.openstack.org/infra/nodepool/configuration.html#elements-dir
--
To view, visit https://gerrit.wikimedia.org/r/235427
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ae5e8ee9d725e84849ec32942972a98c260d382
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
