opendev/system-config
Code Issues Proposed changes

Simplify pholio.o.o node definition

Browse Source 
Get rid of an unnecessary pholio.pp wrapper classfile which was just
a straight passthrough of classvars. Instead pass parameters
straight to the phabricator module from the global site manifest.
Also explicitly our desired ServerName and standard ServerAdmin for
the vhost template explicitly.

Change-Id: I3e0e90dd65e43b11c0cb74e0469143d7624ab850
Depends-On: I238682ac05bdd20ec293b7a16370563763e35249
This commit is contained in:
Jeremy Stanley 2016-11-16 18:51:07 +00:00
parent 567af16002
commit 2c477a235d
2 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/site.pp
View File

@ -541,7 +541,9 @@ node /^pholio\d+\.openstack\.org$/ {
iptables_public_tcp_ports => [22, 80, 443],
sysadmins => hiera('sysadmins', []),
}
class { 'openstack_project::pholio':
class { '::phabricator':
httpd_admin_email => hiera('infra_apache_serveradmin'),
httpd_vhost_name => 'pholio.openstack.org'),
mysql_user_password => hiera('pholio_mysql_user_password'),
mysql_root_password => hiera('pholio_mysql_root_password'),
ssl_cert_file_contents => hiera('ssl_cert_file_contents'),

26
modules/openstack_project/manifests/pholio.pp
View File

@ -1,26 +0,0 @@
# == Class: openstack_project::pholio
#
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,
) {
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,
}
}