From d03d67eb725b66a32056b71adb4bd70bfc14361c Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 4 Nov 2016 11:03:54 +1100 Subject: [PATCH] Add mysql and ssl details for pholio01.openstack.org Add these details for pholio bringup Change-Id: I648734c8679574f565bada326aedce1dffeeff35 --- manifests/site.pp | 9 ++++++++- modules/openstack_project/manifests/pholio.pp | 19 ++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index ba490b3db7..655d37b56f 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -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. diff --git a/modules/openstack_project/manifests/pholio.pp b/modules/openstack_project/manifests/pholio.pp index 1e51284d76..a1a3178cc9 100644 --- a/modules/openstack_project/manifests/pholio.pp +++ b/modules/openstack_project/manifests/pholio.pp @@ -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, + } }