From 2c477a235da8507f6bd61a8b33c370e2248659bc Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Wed, 16 Nov 2016 18:51:07 +0000
Subject: [PATCH] Simplify pholio.o.o node definition

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
---
 manifests/site.pp                             |  4 ++-
 modules/openstack_project/manifests/pholio.pp | 26 -------------------
 2 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 modules/openstack_project/manifests/pholio.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index 633083f2d1..e53ddeb947 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -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'),
diff --git a/modules/openstack_project/manifests/pholio.pp b/modules/openstack_project/manifests/pholio.pp
deleted file mode 100644
index a1a3178cc9..0000000000
--- a/modules/openstack_project/manifests/pholio.pp
+++ /dev/null
@@ -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,
-  }
-
-}