opendev/system-config
Code Issues Proposed changes

Merge "Override FQDN defaults for OpenStackID servers"

Browse Source
This commit is contained in:
Zuul 2019-02-06 19:18:43 +00:00 committed by Gerrit Code Review
commit 5064852540
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/site.pp
View File

@ -1100,6 +1100,10 @@ node /^openstackid\d*(\.openstack)?\.org$/ {
ssl_chain_file_contents => hiera('openstackid_ssl_chain_file_contents'), ssl_chain_file_contents => hiera('openstackid_ssl_chain_file_contents'),
id_recaptcha_public_key => hiera('openstackid_recaptcha_public_key'), id_recaptcha_public_key => hiera('openstackid_recaptcha_public_key'),
id_recaptcha_private_key => hiera('openstackid_recaptcha_private_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_url => 'https://openstackid.org',
app_key => hiera('openstackid_app_key'), app_key => hiera('openstackid_app_key'),
id_log_error_to_email => 'openstack@tipit.net', 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'), ssl_chain_file_contents => hiera('openstackid_dev_ssl_chain_file_contents'),
id_recaptcha_public_key => hiera('openstackid_dev_recaptcha_public_key'), id_recaptcha_public_key => hiera('openstackid_dev_recaptcha_public_key'),
id_recaptcha_private_key => hiera('openstackid_dev_recaptcha_private_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_url => 'https://openstackid-dev.openstack.org',
app_key => hiera('openstackid_dev_app_key'), app_key => hiera('openstackid_dev_app_key'),
id_log_error_to_email => 'openstack@tipit.net', id_log_error_to_email => 'openstack@tipit.net',

8
modules/openstack_project/manifests/openstackid_dev.pp
View File

@ -38,6 +38,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 = '',
$serveradmin = '',
$canonicalweburl = '',
$session_cookie_domain = '',
$app_url = '', $app_url = '',
$app_key = '', $app_key = '',
$email_driver = 'mail', $email_driver = 'mail',
@ -97,6 +101,10 @@ class openstack_project::openstackid_dev (
ssl_cert_file_contents => $ssl_cert_file_contents, ssl_cert_file_contents => $ssl_cert_file_contents,
ssl_key_file_contents => $ssl_key_file_contents, ssl_key_file_contents => $ssl_key_file_contents,
ssl_chain_file_contents => $ssl_chain_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_url => $app_url,
app_key => $app_key, app_key => $app_key,
email_driver => $email_driver, email_driver => $email_driver,

8
modules/openstack_project/manifests/openstackid_prod.pp
View File

@ -38,6 +38,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 = '',
$serveradmin = '',
$canonicalweburl = '',
$session_cookie_domain = '',
$release = '1.0.25', $release = '1.0.25',
$app_url = '', $app_url = '',
$app_key = '', $app_key = '',
@ -97,6 +101,10 @@ class openstack_project::openstackid_prod (
ssl_cert_file_contents => $ssl_cert_file_contents, ssl_cert_file_contents => $ssl_cert_file_contents,
ssl_key_file_contents => $ssl_key_file_contents, ssl_key_file_contents => $ssl_key_file_contents,
ssl_chain_file_contents => $ssl_chain_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, openstackid_release => $release,
app_url => $app_url, app_url => $app_url,
app_key => $app_key, app_key => $app_key,