Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/242863
Change subject: otrs: use hiera to get configuration values ...................................................................... otrs: use hiera to get configuration values We want iodine and mendelevium to use different database hosts and databases for now and in the future whenever we will be conducting a migration. Have those values specified in hiera and then pass them to the otrs class Change-Id: I5feeec6164dd5addb4ab934d202ccd304deac4fb --- A hieradata/hosts/iodine.yaml A hieradata/hosts/mendelevium.yaml M manifests/role/otrs.pp 3 files changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/63/242863/1 diff --git a/hieradata/hosts/iodine.yaml b/hieradata/hosts/iodine.yaml new file mode 100644 index 0000000..69b24c5 --- /dev/null +++ b/hieradata/hosts/iodine.yaml @@ -0,0 +1,2 @@ +otrs::otrs_database_host: m2-master.eqiad.wmnet +otrs::otrs_database_name: otrs diff --git a/hieradata/hosts/mendelevium.yaml b/hieradata/hosts/mendelevium.yaml new file mode 100644 index 0000000..78bf09e --- /dev/null +++ b/hieradata/hosts/mendelevium.yaml @@ -0,0 +1,2 @@ +otrs::otrs_database_host: db2011.codfw.wmnet +otrs::otrs_database_name: testotrs diff --git a/manifests/role/otrs.pp b/manifests/role/otrs.pp index 9c7ee6c..f65cbdc 100644 --- a/manifests/role/otrs.pp +++ b/manifests/role/otrs.pp @@ -15,9 +15,12 @@ $otrs_database_pw = $::passwords::mysql::otrs::pass $exim_database_pass = $passwords::exim::otrs_mysql_password + $otrs_database_host = hiera('otrs::otrs_database_host') + $otrs_database_name = hiera('otrs::otrs_database_name') + class { '::otrs': - otrs_database_host => 'm2-master.eqiad.wmnet', - otrs_database_name => 'otrs', + otrs_database_host => $otrs_database_host, + otrs_database_name => $otrs_database_name, otrs_database_user => $otrs_database_user, otrs_database_pw => $otrs_database_pw, exim_database_name => 'otrs', -- To view, visit https://gerrit.wikimedia.org/r/242863 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5feeec6164dd5addb4ab934d202ccd304deac4fb Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits