From cf53072d7d75fb839dd0a3434ab8ef4acf6f330a Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Tue, 5 Feb 2019 23:31:53 +0000 Subject: [PATCH] Override FQDN defaults for OpenStackID servers The current OpenStackID servers have hostnames matching the names of their Web site vhosts in Apache. Their replacements will have different hostnames/server instance names but should retain their original Web site identities. To facilitate this, explicitly pass in the expected hostnames for the corresponding class parameters which normally default to $::fqdn in the puppet-openstackid module. Change-Id: I395626ee11e287dac5766f4027a067e2c918a9ed --- manifests/site.pp | 8 ++++++++ modules/openstack_project/manifests/openstackid_dev.pp | 8 ++++++++ modules/openstack_project/manifests/openstackid_prod.pp | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/manifests/site.pp b/manifests/site.pp index 590a9c6031..a7e3c61575 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1100,6 +1100,10 @@ node /^openstackid\d*(\.openstack)?\.org$/ { ssl_chain_file_contents => hiera('openstackid_ssl_chain_file_contents'), id_recaptcha_public_key => hiera('openstackid_recaptcha_public_key'), id_recaptcha_private_key => hiera('openstackid_recaptcha_private_key'), + vhost_name => 'openstackid.org', + session_cookie_domain => 'openstackid.org', + serveradmin => 'webmaster@openstackid.org', + canonicalweburl => 'https://openstackid.org/', app_url => 'https://openstackid.org', app_key => hiera('openstackid_app_key'), id_log_error_to_email => 'openstack@tipit.net', @@ -1129,6 +1133,10 @@ node /^openstackid-dev\d*\.openstack\.org$/ { ssl_chain_file_contents => hiera('openstackid_dev_ssl_chain_file_contents'), id_recaptcha_public_key => hiera('openstackid_dev_recaptcha_public_key'), id_recaptcha_private_key => hiera('openstackid_dev_recaptcha_private_key'), + vhost_name => 'openstackid-dev.openstack.org', + session_cookie_domain => 'openstackid-dev.openstack.org', + serveradmin => 'webmaster@openstackid-dev.openstack.org', + canonicalweburl => 'https://openstackid-dev.openstack.org/', app_url => 'https://openstackid-dev.openstack.org', app_key => hiera('openstackid_dev_app_key'), id_log_error_to_email => 'openstack@tipit.net', diff --git a/modules/openstack_project/manifests/openstackid_dev.pp b/modules/openstack_project/manifests/openstackid_dev.pp index 46a07a0d58..142c86e13a 100644 --- a/modules/openstack_project/manifests/openstackid_dev.pp +++ b/modules/openstack_project/manifests/openstackid_dev.pp @@ -38,6 +38,10 @@ class openstack_project::openstackid_dev ( $ssl_cert_file_contents = '', $ssl_key_file_contents = '', $ssl_chain_file_contents = '', + $vhost_name = '', + $serveradmin = '', + $canonicalweburl = '', + $session_cookie_domain = '', $app_url = '', $app_key = '', $email_driver = 'mail', @@ -97,6 +101,10 @@ class openstack_project::openstackid_dev ( ssl_cert_file_contents => $ssl_cert_file_contents, ssl_key_file_contents => $ssl_key_file_contents, ssl_chain_file_contents => $ssl_chain_file_contents, + vhost_name => $vhost_name, + serveradmin => $serveradmin, + canonicalweburl => $canonicalweburl, + session_cookie_domain => $session_cookie_domain, app_url => $app_url, app_key => $app_key, email_driver => $email_driver, diff --git a/modules/openstack_project/manifests/openstackid_prod.pp b/modules/openstack_project/manifests/openstackid_prod.pp index a720d7ed7b..371ce96acd 100644 --- a/modules/openstack_project/manifests/openstackid_prod.pp +++ b/modules/openstack_project/manifests/openstackid_prod.pp @@ -38,6 +38,10 @@ class openstack_project::openstackid_prod ( $ssl_cert_file_contents = '', $ssl_key_file_contents = '', $ssl_chain_file_contents = '', + $vhost_name = '', + $serveradmin = '', + $canonicalweburl = '', + $session_cookie_domain = '', $release = '1.0.25', $app_url = '', $app_key = '', @@ -97,6 +101,10 @@ class openstack_project::openstackid_prod ( ssl_cert_file_contents => $ssl_cert_file_contents, ssl_key_file_contents => $ssl_key_file_contents, ssl_chain_file_contents => $ssl_chain_file_contents, + vhost_name => $vhost_name, + serveradmin => $serveradmin, + canonicalweburl => $canonicalweburl, + session_cookie_domain => $session_cookie_domain, openstackid_release => $release, app_url => $app_url, app_key => $app_key,