From ce6de87ea738777bf343a5cf3b0863982044e9d0 Mon Sep 17 00:00:00 2001 From: smarcet Date: Mon, 24 Feb 2020 10:34:24 -0300 Subject: [PATCH] Removed OpenStackID stale config variables Removed all variables related to Silverstripe Dependency Change-Id: Ib5e6834686c4952dd8e7220a31abe71a9278e397 Signed-off-by: smarcet --- manifests/site.pp | 16 ------------- .../manifests/openstackid_dev.pp | 18 +------------- .../manifests/openstackid_prod.pp | 24 +------------------ 3 files changed, 2 insertions(+), 56 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 2e00ed4e16..e0c71e98e3 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1027,10 +1027,6 @@ node /^openstackid\d*(\.openstack)?\.org$/ { id_mysql_password => hiera('openstackid_id_mysql_password'), id_mysql_user => hiera('openstackid_id_mysql_user', 'username'), id_db_name => hiera('openstackid_id_db_name'), - ss_mysql_host => hiera('openstackid_ss_mysql_host', 'localhost'), - ss_mysql_password => hiera('openstackid_ss_mysql_password'), - ss_mysql_user => hiera('openstackid_ss_mysql_user', 'username'), - ss_db_name => hiera('openstackid_ss_db_name', 'username'), redis_password => hiera('openstackid_redis_password'), ssl_cert_file_contents => hiera('openstackid_ssl_cert_file_contents'), ssl_key_file_contents => hiera('openstackid_ssl_key_file_contents'), @@ -1052,10 +1048,6 @@ 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', } } @@ -1067,10 +1059,6 @@ node /^openstackid-dev\d*\.openstack\.org$/ { id_mysql_host => hiera('openstackid_dev_id_mysql_host', 'localhost'), id_mysql_password => hiera('openstackid_dev_id_mysql_password'), id_mysql_user => hiera('openstackid_dev_id_mysql_user', 'username'), - ss_mysql_host => hiera('openstackid_dev_ss_mysql_host', 'localhost'), - ss_mysql_password => hiera('openstackid_dev_ss_mysql_password'), - ss_mysql_user => hiera('openstackid_dev_ss_mysql_user', 'username'), - ss_db_name => hiera('openstackid_dev_ss_db_name', 'username'), redis_password => hiera('openstackid_dev_redis_password'), ssl_cert_file_contents => hiera('openstackid_dev_ssl_cert_file_contents'), ssl_key_file_contents => hiera('openstackid_dev_ssl_key_file_contents'), @@ -1092,10 +1080,6 @@ 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', } } diff --git a/modules/openstack_project/manifests/openstackid_dev.pp b/modules/openstack_project/manifests/openstackid_dev.pp index 5701870c65..7fef4a34cf 100644 --- a/modules/openstack_project/manifests/openstackid_dev.pp +++ b/modules/openstack_project/manifests/openstackid_dev.pp @@ -20,10 +20,6 @@ class openstack_project::openstackid_dev ( $id_mysql_user = '', $id_mysql_password = '', $id_db_name = 'openstackid_dev', - $ss_mysql_host = '', - $ss_mysql_user = '', - $ss_mysql_password = '', - $ss_db_name = 'os_dev', $redis_port = '6378', $redis_max_memory = '1gb', $redis_bind = '127.0.0.1', @@ -64,7 +60,7 @@ class openstack_project::openstackid_dev ( $cache_driver = 'redis', $session_driver = 'redis', $session_cookie_secure = false, - $php_version = 5, + $php_version = 7, $mysql_ssl_enabled = false, $mysql_ssl_ca_file = '/etc/mysql-client-ssl/ca-cert.pem', $mysql_ssl_ca_file_contents = '', @@ -72,10 +68,6 @@ 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 = '', - $lost_password_url = '', - $registration_url = '', - $registration_mobile_url = '', - $resend_verification_url = '', ) { class { 'openstack_project::server': } @@ -86,10 +78,6 @@ class openstack_project::openstackid_dev ( id_mysql_user => $id_mysql_user, id_mysql_password => $id_mysql_password, id_db_name => $id_db_name, - ss_mysql_host => $ss_mysql_host, - ss_mysql_user => $ss_mysql_user, - ss_mysql_password => $ss_mysql_password, - ss_db_name => $ss_db_name, redis_port => $redis_port, redis_host => $redis_bind, redis_password => $redis_password, @@ -139,10 +127,6 @@ 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) diff --git a/modules/openstack_project/manifests/openstackid_prod.pp b/modules/openstack_project/manifests/openstackid_prod.pp index 4bc183143e..4d5213ddd1 100644 --- a/modules/openstack_project/manifests/openstackid_prod.pp +++ b/modules/openstack_project/manifests/openstackid_prod.pp @@ -20,10 +20,6 @@ class openstack_project::openstackid_prod ( $id_mysql_user = '', $id_mysql_password = '', $id_db_name = '', - $ss_mysql_host = '', - $ss_mysql_user = '', - $ss_mysql_password = '', - $ss_db_name = '', $redis_port = '6378', $redis_max_memory = '1gb', $redis_bind = '127.0.0.1', @@ -65,7 +61,7 @@ class openstack_project::openstackid_prod ( $cache_driver = 'redis', $session_driver = 'redis', $session_cookie_secure = false, - $php_version = 5, + $php_version = 7, $mysql_ssl_enabled = false, $mysql_ssl_ca_file = '/etc/mysql-client-ssl/ca-cert.pem', $mysql_ssl_ca_file_contents = '', @@ -73,10 +69,6 @@ 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 = '', - $lost_password_url = '', - $registration_url = '', - $registration_mobile_url = '', - $resend_verification_url = '', ) { class { 'openstack_project::server': } @@ -87,10 +79,6 @@ class openstack_project::openstackid_prod ( id_mysql_user => $id_mysql_user, id_mysql_password => $id_mysql_password, id_db_name => $id_db_name, - ss_mysql_host => $ss_mysql_host, - ss_mysql_user => $ss_mysql_user, - ss_mysql_password => $ss_mysql_password, - ss_db_name => $ss_db_name, redis_port => $redis_port, redis_host => $redis_bind, redis_password => $redis_password, @@ -142,10 +130,6 @@ 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) @@ -163,10 +147,4 @@ class openstack_project::openstackid_prod ( database_password => $id_mysql_password, } - mysql_backup::backup_remote { $ss_db_name: - database_host => $ss_mysql_host, - database_user => $ss_mysql_user, - database_password => $ss_mysql_password, - num_backups => 2, # big and presumably also backed up by www.o.o - } }