From 1dacc6c9db9a438112520157c724d55d2e622d9e Mon Sep 17 00:00:00 2001 From: Sebastian Marcet Date: Thu, 14 Feb 2019 10:30:11 -0300 Subject: [PATCH] Update puppet config for openstackid-dev node Added mysql ssl cert from hiera Change-Id: Id754acfd2b4234146f2fc431599a50b053d3ffdf --- manifests/site.pp | 58 +++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 1b1c10a047..30316c8e26 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1129,33 +1129,37 @@ node /^openstackid\d*(\.openstack)?\.org$/ { node /^openstackid-dev\d*\.openstack\.org$/ { $group = "openstackid-dev" class { 'openstack_project::openstackid_dev': - site_admin_password => hiera('openstackid_dev_site_admin_password'), - 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'), - ssl_chain_file_contents => hiera('openstackid_dev_ssl_chain_file_contents'), - id_recaptcha_public_key => hiera('openstackid_dev_recaptcha_public_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_key => hiera('openstackid_dev_app_key'), - id_log_error_to_email => 'openstack@tipit.net', - id_log_error_from_email => 'noreply@openstack.org', - email_driver => 'smtp', - email_smtp_server => 'smtp.sendgrid.net', - email_smtp_server_user => hiera('openstackid_dev_smtp_user'), - email_smtp_server_password => hiera('openstackid_dev_smtp_password'), - php_version => 7, + site_admin_password => hiera('openstackid_dev_site_admin_password'), + 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'), + ssl_chain_file_contents => hiera('openstackid_dev_ssl_chain_file_contents'), + id_recaptcha_public_key => hiera('openstackid_dev_recaptcha_public_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_key => hiera('openstackid_dev_app_key'), + id_log_error_to_email => 'openstack@tipit.net', + id_log_error_from_email => 'noreply@openstack.org', + email_driver => 'smtp', + email_smtp_server => 'smtp.sendgrid.net', + email_smtp_server_user => hiera('openstackid_dev_smtp_user'), + email_smtp_server_password => hiera('openstackid_dev_smtp_password'), + php_version => 7, + mysql_ssl_enabled => true, + 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'), } }