Merge "Add mysql and ssl details for pholio01.openstack.org"

This commit is contained in:
Jenkins 2016-11-04 00:32:41 +00:00 committed by Gerrit Code Review
commit 8a8fe625a8
2 changed files with 26 additions and 2 deletions

View File

@ -541,7 +541,14 @@ node /^pholio\d+\.openstack\.org$/ {
iptables_public_tcp_ports => [22, 80, 443],
sysadmins => hiera('sysadmins', []),
}
class { 'openstack_project::pholio': }
class { 'openstack_project::pholio':
mysql_user_password => hiera('pholio_mysql_password'),
mysql_root_password => hiera('pholio_mysql_root_password'),
# snakeoil for now; will move to real key soon (ianw 2016-11-04)
ssl_cert_file => '/etc/ssl/certs/ssl-cert-snakeoil.pem',
ssl_key_file => '/etc/ssl/private/ssl-cert-snakeoil.key',
ssl_chain_file => '',
}
}
# CentOS machines to load balance git access.

View File

@ -2,8 +2,25 @@
#
class openstack_project::pholio (
$mysql_root_password,
$mysql_user_password,
$ssl_cert_file = undef,
$ssl_key_file = undef,
$ssl_chain_file = undef,
$ssl_cert_file_contents = undef,
$ssl_key_file_contents = undef,
$ssl_chain_file_contents = undef,
) {
include ::phabricator
class { '::phabricator':
mysql_root_password => $mysql_root_password,
mysql_user_password => $mysql_user_password,
ssl_cert_file => $ssl_cert_file,
ssl_key_file => $ssl_key_file,
ssl_chain_file => $ssl_chain_file,
ssl_cert_file_contents => $ssl_cert_file_contents,
ssl_key_file_contents => $ssl_key_file_contents,
ssl_chain_file_contents => $ssl_chain_file_contents,
}
}