opendev/system-config
Code Issues Proposed changes

OpenStackid parametrized urls

Browse Source 
updated config to be able to setup registration/lost password
and resend verification link by config

Depends-On: https://review.opendev.org/#/c/656395/
Depends-On: https://review.opendev.org/#/c/656396/
Change-Id: I9df2afbc6a90652030fde5398f8ac28ca3c4c397
This commit is contained in:
smarcet 2019-04-29 17:29:21 -03:00
parent c3e53998ce
commit 66bf9c5cc4
3 changed files with 26 additions and 3 deletions
manifests
site.pp
modules/openstack_project/manifests
openstackid_dev.ppopenstackid_prod.pp

8
manifests/site.pp

@ -1114,6 +1114,10 @@ node /^openstackid\d*(\.openstack)?\.org$/ {
mysql_ssl_ca_file_contents => hiera('openstackid_mysql_ssl_ca_file_contents'),
mysql_ssl_client_key_file_contents => hiera('openstackid_mysql_ssl_client_key_file_contents'),
mysql_ssl_client_cert_file_contents => hiera('openstackid_mysql_ssl_client_cert_file_contents'),
lost_password_url => 'https://openstackid.org/lost-password',
registration_url => 'https://openstackid.org/registration',
registration_mobile_url => 'https://openstackid.org/registration-mobile',
resend_verification_url => 'https://openstackid.org/resend-verification',
}
}
@ -1150,6 +1154,10 @@ node /^openstackid-dev\d*\.openstack\.org$/ {
mysql_ssl_ca_file_contents => hiera('openstackid_dev_mysql_ssl_ca_file_contents'),
mysql_ssl_client_key_file_contents => hiera('openstackid_dev_mysql_ssl_client_key_file_contents'),
mysql_ssl_client_cert_file_contents => hiera('openstackid_dev_mysql_ssl_client_cert_file_contents'),
lost_password_url => 'https://openstackid-dev.openstack.org/lost-password',
registration_url => 'https://openstackid-dev.openstack.org/registration',
registration_mobile_url => 'https://openstackid-dev.openstack.org/registration-mobile',
resend_verification_url => 'https://openstackid-dev.openstack.org/resend-verification',
}
}

11
modules/openstack_project/manifests/openstackid_dev.pp

@ -71,8 +71,11 @@ class openstack_project::openstackid_dev (
$mysql_ssl_client_key_file = '/etc/mysql-client-ssl/client-key.pem',
$mysql_ssl_client_key_file_contents = '',
$mysql_ssl_client_cert_file = '/etc/mysql-client-ssl/client-cert.pem',
$mysql_ssl_client_cert_file_contents = ''
$mysql_ssl_client_cert_file_contents = '',
$lost_password_url = '',
$registration_url = '',
$registration_mobile_url = '',
$resend_verification_url = '',
) {
class { 'openstack_project::server': }
@ -136,6 +139,10 @@ class openstack_project::openstackid_dev (
mysql_ssl_client_key_file_contents => $mysql_ssl_client_key_file_contents,
mysql_ssl_client_cert_file => $mysql_ssl_client_cert_file,
mysql_ssl_client_cert_file_contents => $mysql_ssl_client_cert_file_contents,
lost_password_url => $lost_password_url,
registration_url => $registration_url,
registration_mobile_url => $registration_mobile_url,
resend_verification_url => $resend_verification_url,
}
# redis (custom module written by tipit)

10
modules/openstack_project/manifests/openstackid_prod.pp

@ -71,7 +71,11 @@ class openstack_project::openstackid_prod (
$mysql_ssl_client_key_file = '/etc/mysql-client-ssl/client-key.pem',
$mysql_ssl_client_key_file_contents = '',
$mysql_ssl_client_cert_file = '/etc/mysql-client-ssl/client-cert.pem',
$mysql_ssl_client_cert_file_contents = ''
$mysql_ssl_client_cert_file_contents = '',
$lost_password_url = '',
$registration_url = '',
$registration_mobile_url = '',
$resend_verification_url = '',
) {
class { 'openstack_project::server': }
@ -136,6 +140,10 @@ class openstack_project::openstackid_prod (
mysql_ssl_client_key_file_contents => $mysql_ssl_client_key_file_contents,
mysql_ssl_client_cert_file => $mysql_ssl_client_cert_file,
mysql_ssl_client_cert_file_contents => $mysql_ssl_client_cert_file_contents,
lost_password_url => $lost_password_url,
registration_url => $registration_url,
registration_mobile_url => $registration_mobile_url,
resend_verification_url => $resend_verification_url,
}
# redis (custom module written by tipit)