From 4b08d386febac5a7e78bf9fc0f54588a68d172b5 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Wed, 2 May 2018 20:55:21 +0000 Subject: [PATCH] Correct canonicalweburl and vhost_name for review We need to explicitly set the $canonicalweburl and $vhost_name parameters for the ::gerrit class when instantiating it in openstack_project::review so that it gets passed through correctly overriding the $fqdn default, now that we're using ordinally-numbered hosts with a CNAME for this service. Change-Id: I6d12c6e6a1bd90e40042124a801c1439f283d7fd --- modules/openstack_project/manifests/review.pp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/openstack_project/manifests/review.pp b/modules/openstack_project/manifests/review.pp index 100499cb26..fe3605fc80 100644 --- a/modules/openstack_project/manifests/review.pp +++ b/modules/openstack_project/manifests/review.pp @@ -90,6 +90,8 @@ class openstack_project::review ( if ($gerrit_configure) { $accountpatchreviewdb_url = "jdbc:mysql://${mysql_host}:3306/accountPatchReviewDb?characterSetResults=utf8&characterEncoding=utf8&connectionCollation=utf8_bin&useUnicode=yes&user=gerrit2&password=${mysql_password}" class { 'openstack_project::gerrit': + vhost_name => 'review.openstack.org', + canonicalweburl => 'https://review.openstack.org/', git_http_url => 'https://git.openstack.org/', canonical_git_url => 'git://git.openstack.org/', ssl_cert_file => $ssl_cert_file, @@ -307,7 +309,7 @@ class openstack_project::review ( password => $gerritbot_password, server => 'irc.freenode.net', user => 'gerritbot', - vhost_name => $::fqdn, + vhost_name => 'review.openstack.org', ssh_rsa_key_contents => $gerritbot_ssh_rsa_key_contents, ssh_rsa_pubkey_contents => $gerritbot_ssh_rsa_pubkey_contents, channel_file => $::project_config::gerritbot_channel_file,