opendev/system-config
Code Issues Proposed changes

Merge "Added new param to IDP config"

Browse Source
This commit is contained in:
Zuul 2020-03-25 22:18:04 +00:00 committed by Gerrit Code Review
commit 8171dc437c
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/site.pp
View File

@ -1001,6 +1001,7 @@ node /^openstackid\d*(\.openstack)?\.org$/ {
mysql_ssl_ca_file_contents => hiera('openstackid_mysql_ssl_ca_file_contents'), 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_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'), mysql_ssl_client_cert_file_contents => hiera('openstackid_mysql_ssl_client_cert_file_contents'),
user_spam_processor_to => hiera('openstackid_user_spam_processor_to'),
} }
} }
@ -1033,6 +1034,7 @@ node /^openstackid-dev\d*\.openstack\.org$/ {
mysql_ssl_ca_file_contents => hiera('openstackid_dev_mysql_ssl_ca_file_contents'), 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_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'), mysql_ssl_client_cert_file_contents => hiera('openstackid_dev_mysql_ssl_client_cert_file_contents'),
user_spam_processor_to => hiera('openstackid_dev_user_spam_processor_to'),
} }
} }

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

@ -68,6 +68,7 @@ class openstack_project::openstackid_dev (
$mysql_ssl_client_key_file_contents = '', $mysql_ssl_client_key_file_contents = '',
$mysql_ssl_client_cert_file = '/etc/mysql-client-ssl/client-cert.pem', $mysql_ssl_client_cert_file = '/etc/mysql-client-ssl/client-cert.pem',
$mysql_ssl_client_cert_file_contents = '', $mysql_ssl_client_cert_file_contents = '',
$user_spam_processor_to = '',
) { ) {
class { 'openstack_project::server': } class { 'openstack_project::server': }
@ -127,6 +128,7 @@ class openstack_project::openstackid_dev (
mysql_ssl_client_key_file_contents => $mysql_ssl_client_key_file_contents, 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 => $mysql_ssl_client_cert_file,
mysql_ssl_client_cert_file_contents => $mysql_ssl_client_cert_file_contents, mysql_ssl_client_cert_file_contents => $mysql_ssl_client_cert_file_contents,
user_spam_processor_to => $user_spam_processor_to
} }
# redis (custom module written by tipit) # redis (custom module written by tipit)

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

@ -69,6 +69,7 @@ class openstack_project::openstackid_prod (
$mysql_ssl_client_key_file_contents = '', $mysql_ssl_client_key_file_contents = '',
$mysql_ssl_client_cert_file = '/etc/mysql-client-ssl/client-cert.pem', $mysql_ssl_client_cert_file = '/etc/mysql-client-ssl/client-cert.pem',
$mysql_ssl_client_cert_file_contents = '', $mysql_ssl_client_cert_file_contents = '',
$user_spam_processor_to = '',
) { ) {
class { 'openstack_project::server': } class { 'openstack_project::server': }
@ -130,6 +131,7 @@ class openstack_project::openstackid_prod (
mysql_ssl_client_key_file_contents => $mysql_ssl_client_key_file_contents, 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 => $mysql_ssl_client_cert_file,
mysql_ssl_client_cert_file_contents => $mysql_ssl_client_cert_file_contents, mysql_ssl_client_cert_file_contents => $mysql_ssl_client_cert_file_contents,
user_spam_processor_to => $user_spam_processor_to
} }
# redis (custom module written by tipit) # redis (custom module written by tipit)