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 /^openstackid-dev\d*\.open.*\.org$/ {
|
||||
# Node-OS: xenial
|
||||
node 'openstackid-dev.openstack.org' {
|
||||
class { 'openstack_project::openstackid_dev':
|
||||
site_admin_password => hiera('openstackid_dev_site_admin_password'),
|
||||
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_user => hiera('openstackid_dev_smtp_user'),
|
||||
email_smtp_server_password => hiera('openstackid_dev_smtp_password'),
|
||||
php_version => 7,
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -59,6 +59,15 @@ class openstack_project::openstackid_dev (
|
||||
$cache_driver = 'redis',
|
||||
$session_driver = 'redis',
|
||||
$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': }
|
||||
@ -109,6 +118,14 @@ class openstack_project::openstackid_dev (
|
||||
cache_driver => $cache_driver,
|
||||
session_driver => $session_driver,
|
||||
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)
|
||||
|
@ -60,6 +60,14 @@ class openstack_project::openstackid_prod (
|
||||
$cache_driver = 'redis',
|
||||
$session_driver = 'redis',
|
||||
$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': }
|
||||
@ -112,6 +120,14 @@ class openstack_project::openstackid_prod (
|
||||
cache_driver => $cache_driver,
|
||||
session_driver => $session_driver,
|
||||
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)
|
||||
|
Loading…
Reference in New Issue
Block a user