opendev/system-config
Code Issues Proposed changes

Merge "Add digit support to etherpad servers"

Browse Source
This commit is contained in:
Zuul
2018-10-08 16:52:28 +00:00
committed by Gerrit Code Review
parent 38b9e983c5 0f0031d16e
commit cab657cf65
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
inventory/groups.yaml
View File

@@ -12,7 +12,8 @@ groups:
eavesdrop: inventory_hostname.startswith('eavesdrop') eavesdrop: inventory_hostname.startswith('eavesdrop')
elasticsearch: inventory_hostname is match('elasticsearch0[1-7]\.openstack\.org') elasticsearch: inventory_hostname is match('elasticsearch0[1-7]\.openstack\.org')
ethercalc: inventory_hostname.startswith('ethercalc') ethercalc: inventory_hostname.startswith('ethercalc')
etherpad: inventory_hostname.startswith('etherpad') etherpad: inventory_hostname is match('etherpad\d*\.openstack\.org')
etherpad-dev: inventory_hostname is match('etherpad-dev\d*\.openstack\.org')
files: inventory_hostname.startswith('files') files: inventory_hostname.startswith('files')
firehose: inventory_hostname.startswith('firehose') firehose: inventory_hostname.startswith('firehose')
futureparser: > futureparser: >

10
manifests/site.pp
View File

@@ -305,9 +305,11 @@ node /^ethercalc\d+\.openstack\.org$/ {
# Node-OS: trusty # Node-OS: trusty
# Node-OS: xenial # Node-OS: xenial
node /^etherpad\d*\.openstack\.org$/ { node /^etherpad\d*\.openstack\.org$/ {
$group = "etherpad"
class { 'openstack_project::server': } class { 'openstack_project::server': }
class { 'openstack_project::etherpad': class { 'openstack_project::etherpad':
vhost_name => 'etherpad.openstack.org',
ssl_cert_file_contents => hiera('etherpad_ssl_cert_file_contents'), ssl_cert_file_contents => hiera('etherpad_ssl_cert_file_contents'),
ssl_key_file_contents => hiera('etherpad_ssl_key_file_contents'), ssl_key_file_contents => hiera('etherpad_ssl_key_file_contents'),
ssl_chain_file_contents => hiera('etherpad_ssl_chain_file_contents'), ssl_chain_file_contents => hiera('etherpad_ssl_chain_file_contents'),
@@ -320,12 +322,14 @@ node /^etherpad\d*\.openstack\.org$/ {
# Node-OS: trusty # Node-OS: trusty
# Node-OS: xenial # Node-OS: xenial
node /^etherpad-dev\d*\.openstack\.org$/ { node /^etherpad-dev\d*\.openstack\.org$/ {
$group = "etherpad-dev"
class { 'openstack_project::server': } class { 'openstack_project::server': }
class { 'openstack_project::etherpad_dev': class { 'openstack_project::etherpad_dev':
mysql_host => hiera('etherpad-dev_db_host', 'localhost'), vhost_name => 'etherpad-dev.openstack.org',
mysql_user => hiera('etherpad-dev_db_user', 'username'), mysql_host => hiera('etherpad-dev_db_host', 'localhost'),
mysql_password => hiera('etherpad-dev_db_password'), mysql_user => hiera('etherpad-dev_db_user', 'username'),
mysql_password => hiera('etherpad-dev_db_password'),
} }
} }

4
modules/openstack_project/manifests/etherpad.pp
View File

@@ -8,7 +8,8 @@ class openstack_project::etherpad (
$ssl_chain_file_contents = '', $ssl_chain_file_contents = '',
$mysql_host = 'localhost', $mysql_host = 'localhost',
$mysql_user = 'eplite', $mysql_user = 'eplite',
$mysql_db_name = 'etherpad-lite' $mysql_db_name = 'etherpad-lite',
$vhost_name = $::fqdn,
) { ) {
class { 'etherpad_lite': class { 'etherpad_lite':
ep_ensure => 'latest', ep_ensure => 'latest',
@@ -17,6 +18,7 @@ class openstack_project::etherpad (
} }
class { 'etherpad_lite::apache': class { 'etherpad_lite::apache':
vhost_name => $vhost_name,
ssl_cert_file => $ssl_cert_file, ssl_cert_file => $ssl_cert_file,
ssl_key_file => $ssl_key_file, ssl_key_file => $ssl_key_file,
ssl_chain_file => $ssl_chain_file, ssl_chain_file => $ssl_chain_file,

4
modules/openstack_project/manifests/etherpad_dev.pp
View File

@@ -2,7 +2,8 @@ class openstack_project::etherpad_dev (
$mysql_password, $mysql_password,
$mysql_host = 'localhost', $mysql_host = 'localhost',
$mysql_user = 'eplite', $mysql_user = 'eplite',
$mysql_db_name = 'etherpad-lite' $mysql_db_name = 'etherpad-lite',
$vhost_name = $::fqdn,
) { ) {
class { 'etherpad_lite': class { 'etherpad_lite':
ep_ensure => 'latest', ep_ensure => 'latest',
@@ -10,6 +11,7 @@ class openstack_project::etherpad_dev (
} }
class { 'etherpad_lite::apache': class { 'etherpad_lite::apache':
vhost_name => $vhost_name,
ssl_cert_file => '/etc/ssl/certs/ssl-cert-snakeoil.pem', ssl_cert_file => '/etc/ssl/certs/ssl-cert-snakeoil.pem',
ssl_key_file => '/etc/ssl/private/ssl-cert-snakeoil.key', ssl_key_file => '/etc/ssl/private/ssl-cert-snakeoil.key',
ssl_chain_file => '', ssl_chain_file => '',