opendev/system-config
Code Issues Proposed changes

Deploy simple ethercalc server

Browse Source 
This is a simple first deployment of an ethercalc service. It does not
come with authenticated redis or redis backups. It will however have
working ssl.

Change-Id: I8c434a6bff42bce75e67fb37665d213f3cc018c8
Depends-On: Id10247211d9643e81bb1b6e8fb67377ba6de873a
This commit is contained in:
Clark Boylan 2017-01-24 11:00:31 -08:00
parent c3093bc1e5
commit 5700271dd5
5 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/site.pp
View File

@ -355,6 +355,22 @@ node 'eavesdrop.openstack.org' {
} }
} }
# Node-OS: trusty
node /^ethercalc\d+\.openstack\.org$/ {
$group = "ethercalc"
class { 'openstack_project::server':
iptables_public_tcp_ports => [22, 80, 443],
sysadmins => hiera('sysadmins', []),
}
class { 'openstack_project::ethercalc':
vhost_name => 'ethercalc.openstack.org',
ssl_cert_file_contents => hiera('ssl_cert_file_contents'),
ssl_key_file_contents => hiera('ssl_key_file_contents'),
ssl_chain_file_contents => hiera('ssl_chain_file_contents'),
}
}
# Node-OS: trusty # Node-OS: trusty
node 'etherpad.openstack.org' { node 'etherpad.openstack.org' {
class { 'openstack_project::server': class { 'openstack_project::server':

1
modules.env
View File

@ -100,6 +100,7 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-diskimage_builde
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-drupal"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-drupal"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-elastic_recheck"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-elastic_recheck"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-elasticsearch"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-elasticsearch"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-ethercalc"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-etherpad_lite"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-etherpad_lite"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-exim"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-exim"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-germqtt"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-germqtt"]="origin/master"

1
modules/openstack_project/files/puppetmaster/groups.txt
View File

@ -5,6 +5,7 @@ cacti ~cacti\d+\.openstack\.org
ci-backup ci-backup-*.openstack.org ci-backup ci-backup-*.openstack.org
disabled ci-backup-rs-ord.openstack.org:db368fcd-e61a-4294-a5cb-851c16650f7a:wiki.openstack.org disabled ci-backup-rs-ord.openstack.org:db368fcd-e61a-4294-a5cb-851c16650f7a:wiki.openstack.org
elasticsearch ~elasticsearch0[1-7]\.openstack\.org elasticsearch ~elasticsearch0[1-7]\.openstack\.org
ethercalc ~ethercalc\d+\.openstack\.org
git-loadbalancer ~git(-fe\d+)?\.openstack\.org git-loadbalancer ~git(-fe\d+)?\.openstack\.org
git-server ~git\d+\.openstack\.org git-server ~git\d+\.openstack\.org
logstash-worker ~logstash-worker\d+\.openstack\.org logstash-worker ~logstash-worker\d+\.openstack\.org

1
modules/openstack_project/files/ssl_cert_check/ssldomains
View File

@ -1,4 +1,5 @@
ask.openstack.org 443 ask.openstack.org 443
ethercalc.openstack.org 443
etherpad.openstack.org 443 etherpad.openstack.org 443
git.openstack.org 443 git.openstack.org 443
groups.openstack.org 443 groups.openstack.org 443

24
modules/openstack_project/manifests/ethercalc.pp Normal file
View File

@ -0,0 +1,24 @@
class openstack_project::ethercalc (
$vhost_name = $::fqdn,
$ssl_cert_file = '/etc/ssl/certs/ethercalc.openstack.org.pem',
$ssl_key_file = '/etc/ssl/private/ethercalc.openstack.org.key',
$ssl_chain_file = '/etc/ssl/certs/intermediate.pem',
$ssl_cert_file_contents = '',
$ssl_key_file_contents = '',
$ssl_chain_file_contents = '',
) {
include ethercalc
class { 'ethercalc::apache':
vhost_name => $vhost_name,
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,
}
# TODO(clarkb) Redis backups
include ethercalc::redis
}