Migrate OpenStackID dev server to php7
Update scripts to migrate IDP dev server to xenial and php7 Depends-On: https://review.openstack.org/631655 Change-Id: I0de414b6f6083016250f284203562ebe0e72193a
This commit is contained in:
parent
d7c6c4e746
commit
3d12760e4a
@ -1030,8 +1030,8 @@ node 'openstackid.org' {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# Node-OS: trusty
|
# Node-OS: xenial
|
||||||
node /^openstackid-dev\d*\.open.*\.org$/ {
|
node 'openstackid-dev.openstack.org' {
|
||||||
class { 'openstack_project::openstackid_dev':
|
class { 'openstack_project::openstackid_dev':
|
||||||
site_admin_password => hiera('openstackid_dev_site_admin_password'),
|
site_admin_password => hiera('openstackid_dev_site_admin_password'),
|
||||||
id_mysql_host => hiera('openstackid_dev_id_mysql_host', 'localhost'),
|
id_mysql_host => hiera('openstackid_dev_id_mysql_host', 'localhost'),
|
||||||
@ -1055,6 +1055,7 @@ node /^openstackid-dev\d*\.open.*\.org$/ {
|
|||||||
email_smtp_server => 'smtp.sendgrid.net',
|
email_smtp_server => 'smtp.sendgrid.net',
|
||||||
email_smtp_server_user => hiera('openstackid_dev_smtp_user'),
|
email_smtp_server_user => hiera('openstackid_dev_smtp_user'),
|
||||||
email_smtp_server_password => hiera('openstackid_dev_smtp_password'),
|
email_smtp_server_password => hiera('openstackid_dev_smtp_password'),
|
||||||
|
php_version => 7,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -59,56 +59,73 @@ class openstack_project::openstackid_dev (
|
|||||||
$cache_driver = 'redis',
|
$cache_driver = 'redis',
|
||||||
$session_driver = 'redis',
|
$session_driver = 'redis',
|
||||||
$session_cookie_secure = false,
|
$session_cookie_secure = false,
|
||||||
|
$php_version = 5,
|
||||||
|
$mysql_ssl_enabled = false,
|
||||||
|
$mysql_ssl_ca_file = '/etc/mysql-client-ssl/ca-cert.pem',
|
||||||
|
$mysql_ssl_ca_file_contents = '',
|
||||||
|
$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 = ''
|
||||||
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
class { 'openstack_project::server': }
|
class { 'openstack_project::server': }
|
||||||
|
|
||||||
class { 'openstackid':
|
class { 'openstackid':
|
||||||
site_admin_password => $site_admin_password,
|
site_admin_password => $site_admin_password,
|
||||||
id_mysql_host => $id_mysql_host,
|
id_mysql_host => $id_mysql_host,
|
||||||
id_mysql_user => $id_mysql_user,
|
id_mysql_user => $id_mysql_user,
|
||||||
id_mysql_password => $id_mysql_password,
|
id_mysql_password => $id_mysql_password,
|
||||||
id_db_name => $id_db_name,
|
id_db_name => $id_db_name,
|
||||||
ss_mysql_host => $ss_mysql_host,
|
ss_mysql_host => $ss_mysql_host,
|
||||||
ss_mysql_user => $ss_mysql_user,
|
ss_mysql_user => $ss_mysql_user,
|
||||||
ss_mysql_password => $ss_mysql_password,
|
ss_mysql_password => $ss_mysql_password,
|
||||||
ss_db_name => $ss_db_name,
|
ss_db_name => $ss_db_name,
|
||||||
redis_port => $redis_port,
|
redis_port => $redis_port,
|
||||||
redis_host => $redis_bind,
|
redis_host => $redis_bind,
|
||||||
redis_password => $redis_password,
|
redis_password => $redis_password,
|
||||||
id_recaptcha_public_key => $id_recaptcha_public_key,
|
id_recaptcha_public_key => $id_recaptcha_public_key,
|
||||||
id_recaptcha_private_key => $id_recaptcha_private_key,
|
id_recaptcha_private_key => $id_recaptcha_private_key,
|
||||||
id_recaptcha_template => $id_recaptcha_template,
|
id_recaptcha_template => $id_recaptcha_template,
|
||||||
id_log_error_to_email => $id_log_error_to_email,
|
id_log_error_to_email => $id_log_error_to_email,
|
||||||
id_log_error_from_email => $id_log_error_from_email,
|
id_log_error_from_email => $id_log_error_from_email,
|
||||||
id_environment => $id_environment,
|
id_environment => $id_environment,
|
||||||
ssl_cert_file => "/etc/ssl/certs/${::fqdn}.pem",
|
ssl_cert_file => "/etc/ssl/certs/${::fqdn}.pem",
|
||||||
ssl_key_file => "/etc/ssl/private/${::fqdn}.key",
|
ssl_key_file => "/etc/ssl/private/${::fqdn}.key",
|
||||||
ssl_chain_file => '/etc/ssl/certs/intermediate.pem',
|
ssl_chain_file => '/etc/ssl/certs/intermediate.pem',
|
||||||
ssl_cert_file_contents => $ssl_cert_file_contents,
|
ssl_cert_file_contents => $ssl_cert_file_contents,
|
||||||
ssl_key_file_contents => $ssl_key_file_contents,
|
ssl_key_file_contents => $ssl_key_file_contents,
|
||||||
ssl_chain_file_contents => $ssl_chain_file_contents,
|
ssl_chain_file_contents => $ssl_chain_file_contents,
|
||||||
app_url => $app_url,
|
app_url => $app_url,
|
||||||
app_key => $app_key,
|
app_key => $app_key,
|
||||||
email_driver => $email_driver,
|
email_driver => $email_driver,
|
||||||
email_smtp_server => $email_smtp_server,
|
email_smtp_server => $email_smtp_server,
|
||||||
email_smtp_server_port => $email_smtp_server_port,
|
email_smtp_server_port => $email_smtp_server_port,
|
||||||
email_smtp_server_user => $email_smtp_server_user,
|
email_smtp_server_user => $email_smtp_server_user,
|
||||||
email_smtp_server_password => $email_smtp_server_password,
|
email_smtp_server_password => $email_smtp_server_password,
|
||||||
laravel_version => $laravel_version,
|
laravel_version => $laravel_version,
|
||||||
app_log_level => $app_log_level,
|
app_log_level => $app_log_level,
|
||||||
app_log_email_level => $app_log_email_level,
|
app_log_email_level => $app_log_email_level,
|
||||||
db_log_enabled => $db_log_enabled,
|
db_log_enabled => $db_log_enabled,
|
||||||
banning_enabled => $banning_enabled,
|
banning_enabled => $banning_enabled,
|
||||||
app_debug => $app_debug,
|
app_debug => $app_debug,
|
||||||
app_locale => $app_locale,
|
app_locale => $app_locale,
|
||||||
curl_verify_ssl_cert => $curl_verify_ssl_cert,
|
curl_verify_ssl_cert => $curl_verify_ssl_cert,
|
||||||
curl_allow_redirect => $curl_allow_redirect,
|
curl_allow_redirect => $curl_allow_redirect,
|
||||||
curl_timeout => $curl_timeout,
|
curl_timeout => $curl_timeout,
|
||||||
assets_base_url => $assets_base_url,
|
assets_base_url => $assets_base_url,
|
||||||
cache_driver => $cache_driver,
|
cache_driver => $cache_driver,
|
||||||
session_driver => $session_driver,
|
session_driver => $session_driver,
|
||||||
session_cookie_secure => $session_cookie_secure,
|
session_cookie_secure => $session_cookie_secure,
|
||||||
|
php_version => $php_version,
|
||||||
|
mysql_ssl_enabled => $mysql_ssl_enabled,
|
||||||
|
mysql_ssl_ca_file => $mysql_ssl_ca_file,
|
||||||
|
mysql_ssl_ca_file_contents => $mysql_ssl_ca_file_contents,
|
||||||
|
mysql_ssl_client_key_file => $mysql_ssl_client_key_file,
|
||||||
|
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,
|
||||||
}
|
}
|
||||||
|
|
||||||
# redis (custom module written by tipit)
|
# redis (custom module written by tipit)
|
||||||
|
@ -60,58 +60,74 @@ class openstack_project::openstackid_prod (
|
|||||||
$cache_driver = 'redis',
|
$cache_driver = 'redis',
|
||||||
$session_driver = 'redis',
|
$session_driver = 'redis',
|
||||||
$session_cookie_secure = false,
|
$session_cookie_secure = false,
|
||||||
|
$php_version = 5,
|
||||||
|
$mysql_ssl_enabled = false,
|
||||||
|
$mysql_ssl_ca_file = '/etc/mysql-client-ssl/ca-cert.pem',
|
||||||
|
$mysql_ssl_ca_file_contents = '',
|
||||||
|
$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 = ''
|
||||||
) {
|
) {
|
||||||
|
|
||||||
class { 'openstack_project::server': }
|
class { 'openstack_project::server': }
|
||||||
|
|
||||||
class { 'openstackid':
|
class { 'openstackid':
|
||||||
site_admin_password => $site_admin_password,
|
site_admin_password => $site_admin_password,
|
||||||
id_mysql_host => $id_mysql_host,
|
id_mysql_host => $id_mysql_host,
|
||||||
id_mysql_user => $id_mysql_user,
|
id_mysql_user => $id_mysql_user,
|
||||||
id_mysql_password => $id_mysql_password,
|
id_mysql_password => $id_mysql_password,
|
||||||
id_db_name => $id_db_name,
|
id_db_name => $id_db_name,
|
||||||
ss_mysql_host => $ss_mysql_host,
|
ss_mysql_host => $ss_mysql_host,
|
||||||
ss_mysql_user => $ss_mysql_user,
|
ss_mysql_user => $ss_mysql_user,
|
||||||
ss_mysql_password => $ss_mysql_password,
|
ss_mysql_password => $ss_mysql_password,
|
||||||
ss_db_name => $ss_db_name,
|
ss_db_name => $ss_db_name,
|
||||||
redis_port => $redis_port,
|
redis_port => $redis_port,
|
||||||
redis_host => $redis_bind,
|
redis_host => $redis_bind,
|
||||||
redis_password => $redis_password,
|
redis_password => $redis_password,
|
||||||
id_recaptcha_public_key => $id_recaptcha_public_key,
|
id_recaptcha_public_key => $id_recaptcha_public_key,
|
||||||
id_recaptcha_private_key => $id_recaptcha_private_key,
|
id_recaptcha_private_key => $id_recaptcha_private_key,
|
||||||
id_recaptcha_template => $id_recaptcha_template,
|
id_recaptcha_template => $id_recaptcha_template,
|
||||||
id_log_error_to_email => $id_log_error_to_email,
|
id_log_error_to_email => $id_log_error_to_email,
|
||||||
id_log_error_from_email => $id_log_error_from_email,
|
id_log_error_from_email => $id_log_error_from_email,
|
||||||
id_environment => $id_environment,
|
id_environment => $id_environment,
|
||||||
ssl_cert_file => "/etc/ssl/certs/${::fqdn}.pem",
|
ssl_cert_file => "/etc/ssl/certs/${::fqdn}.pem",
|
||||||
ssl_key_file => "/etc/ssl/private/${::fqdn}.key",
|
ssl_key_file => "/etc/ssl/private/${::fqdn}.key",
|
||||||
ssl_chain_file => '/etc/ssl/certs/intermediate.pem',
|
ssl_chain_file => '/etc/ssl/certs/intermediate.pem',
|
||||||
ssl_cert_file_contents => $ssl_cert_file_contents,
|
ssl_cert_file_contents => $ssl_cert_file_contents,
|
||||||
ssl_key_file_contents => $ssl_key_file_contents,
|
ssl_key_file_contents => $ssl_key_file_contents,
|
||||||
ssl_chain_file_contents => $ssl_chain_file_contents,
|
ssl_chain_file_contents => $ssl_chain_file_contents,
|
||||||
openstackid_release => $release,
|
openstackid_release => $release,
|
||||||
app_url => $app_url,
|
app_url => $app_url,
|
||||||
app_key => $app_key,
|
app_key => $app_key,
|
||||||
app_version => $release,
|
app_version => $release,
|
||||||
email_driver => $email_driver,
|
email_driver => $email_driver,
|
||||||
email_smtp_server => $email_smtp_server,
|
email_smtp_server => $email_smtp_server,
|
||||||
email_smtp_server_port => $email_smtp_server_port,
|
email_smtp_server_port => $email_smtp_server_port,
|
||||||
email_smtp_server_user => $email_smtp_server_user,
|
email_smtp_server_user => $email_smtp_server_user,
|
||||||
email_smtp_server_password => $email_smtp_server_password,
|
email_smtp_server_password => $email_smtp_server_password,
|
||||||
laravel_version => $laravel_version,
|
laravel_version => $laravel_version,
|
||||||
app_log_level => $app_log_level,
|
app_log_level => $app_log_level,
|
||||||
app_log_email_level => $app_log_email_level,
|
app_log_email_level => $app_log_email_level,
|
||||||
db_log_enabled => $db_log_enabled,
|
db_log_enabled => $db_log_enabled,
|
||||||
banning_enabled => $banning_enabled,
|
banning_enabled => $banning_enabled,
|
||||||
app_debug => $app_debug,
|
app_debug => $app_debug,
|
||||||
app_locale => $app_locale,
|
app_locale => $app_locale,
|
||||||
curl_verify_ssl_cert => $curl_verify_ssl_cert,
|
curl_verify_ssl_cert => $curl_verify_ssl_cert,
|
||||||
curl_allow_redirect => $curl_allow_redirect,
|
curl_allow_redirect => $curl_allow_redirect,
|
||||||
curl_timeout => $curl_timeout,
|
curl_timeout => $curl_timeout,
|
||||||
assets_base_url => $assets_base_url,
|
assets_base_url => $assets_base_url,
|
||||||
cache_driver => $cache_driver,
|
cache_driver => $cache_driver,
|
||||||
session_driver => $session_driver,
|
session_driver => $session_driver,
|
||||||
session_cookie_secure => $session_cookie_secure,
|
session_cookie_secure => $session_cookie_secure,
|
||||||
|
php_version => $php_version,
|
||||||
|
mysql_ssl_enabled => $mysql_ssl_enabled,
|
||||||
|
mysql_ssl_ca_file => $mysql_ssl_ca_file,
|
||||||
|
mysql_ssl_ca_file_contents => $mysql_ssl_ca_file_contents,
|
||||||
|
mysql_ssl_client_key_file => $mysql_ssl_client_key_file,
|
||||||
|
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,
|
||||||
}
|
}
|
||||||
|
|
||||||
# redis (custom module written by tipit)
|
# redis (custom module written by tipit)
|
||||||
|
Loading…
Reference in New Issue
Block a user