From de04c6da67b0c642e68c0e87bc8be79d77319291 Mon Sep 17 00:00:00 2001 From: smarcet Date: Wed, 25 Mar 2020 11:32:17 -0300 Subject: [PATCH] Added new param to IDP config Added user_spam_processor_to to dev/production Change-Id: I36a41bdcd23df9540183da5a087d364778d60b48 Signed-off-by: smarcet --- manifests/site.pp | 2 ++ modules/openstack_project/manifests/openstackid_dev.pp | 2 ++ modules/openstack_project/manifests/openstackid_prod.pp | 2 ++ 3 files changed, 6 insertions(+) diff --git a/manifests/site.pp b/manifests/site.pp index f95aa64f37..5c2383cffb 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1001,6 +1001,7 @@ 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'), + 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_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'), + user_spam_processor_to => hiera('openstackid_dev_user_spam_processor_to'), } } diff --git a/modules/openstack_project/manifests/openstackid_dev.pp b/modules/openstack_project/manifests/openstackid_dev.pp index 7fef4a34cf..c4be24548a 100644 --- a/modules/openstack_project/manifests/openstackid_dev.pp +++ b/modules/openstack_project/manifests/openstackid_dev.pp @@ -68,6 +68,7 @@ class openstack_project::openstackid_dev ( $mysql_ssl_client_key_file_contents = '', $mysql_ssl_client_cert_file = '/etc/mysql-client-ssl/client-cert.pem', $mysql_ssl_client_cert_file_contents = '', + $user_spam_processor_to = '', ) { 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_cert_file => $mysql_ssl_client_cert_file, 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) diff --git a/modules/openstack_project/manifests/openstackid_prod.pp b/modules/openstack_project/manifests/openstackid_prod.pp index 7f86100f71..6527f3d577 100644 --- a/modules/openstack_project/manifests/openstackid_prod.pp +++ b/modules/openstack_project/manifests/openstackid_prod.pp @@ -69,6 +69,7 @@ class openstack_project::openstackid_prod ( $mysql_ssl_client_key_file_contents = '', $mysql_ssl_client_cert_file = '/etc/mysql-client-ssl/client-cert.pem', $mysql_ssl_client_cert_file_contents = '', + $user_spam_processor_to = '', ) { 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_cert_file => $mysql_ssl_client_cert_file, 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)