opendev/system-config
Code Issues Proposed changes

Merge "Moved out the server class from the etherpad and etherpad-dev classes"

Browse Source
This commit is contained in:
Jenkins 2015-07-08 22:28:01 +00:00 committed by Gerrit Code Review
commit 689079319d
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/site.pp
View File

@ -312,6 +312,11 @@ node 'eavesdrop.openstack.org' {
# Node-OS: precise # Node-OS: precise
node 'etherpad.openstack.org' { node 'etherpad.openstack.org' {
class { 'openstack_project::server':
iptables_public_tcp_ports => [22, 80, 443],
sysadmins => hiera('sysadmins', []),
}
class { 'openstack_project::etherpad': class { 'openstack_project::etherpad':
ssl_cert_file_contents => hiera('etherpad_ssl_cert_file_contents', 'XXX'), ssl_cert_file_contents => hiera('etherpad_ssl_cert_file_contents', 'XXX'),
ssl_key_file_contents => hiera('etherpad_ssl_key_file_contents', 'XXX'), ssl_key_file_contents => hiera('etherpad_ssl_key_file_contents', 'XXX'),
@ -319,17 +324,20 @@ node 'etherpad.openstack.org' {
mysql_host => hiera('etherpad_db_host', 'localhost'), mysql_host => hiera('etherpad_db_host', 'localhost'),
mysql_user => hiera('etherpad_db_user', 'username'), mysql_user => hiera('etherpad_db_user', 'username'),
mysql_password => hiera('etherpad_db_password', 'XXX'), mysql_password => hiera('etherpad_db_password', 'XXX'),
sysadmins => hiera('sysadmins', []),
} }
} }
# Node-OS: precise # Node-OS: precise
node 'etherpad-dev.openstack.org' { node 'etherpad-dev.openstack.org' {
class { 'openstack_project::server':
iptables_public_tcp_ports => [22, 80, 443],
sysadmins => hiera('sysadmins', []),
}
class { 'openstack_project::etherpad_dev': class { 'openstack_project::etherpad_dev':
mysql_host => hiera('etherpad-dev_db_host', 'localhost'), mysql_host => hiera('etherpad-dev_db_host', 'localhost'),
mysql_user => hiera('etherpad-dev_db_user', 'username'), mysql_user => hiera('etherpad-dev_db_user', 'username'),
mysql_password => hiera('etherpad-dev_db_password', 'XXX'), mysql_password => hiera('etherpad-dev_db_password', 'XXX'),
sysadmins => hiera('sysadmins', []),
} }
} }

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

@ -8,14 +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'
$sysadmins = []
) { ) {
class { 'openstack_project::server':
iptables_public_tcp_ports => [22, 80, 443],
sysadmins => $sysadmins
}
class { 'etherpad_lite': class { 'etherpad_lite':
ep_ensure => 'latest', ep_ensure => 'latest',
eplite_version => '2bf16fe09fe9a6af804666d15ff4704620369d9f', eplite_version => '2bf16fe09fe9a6af804666d15ff4704620369d9f',

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

@ -2,14 +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'
$sysadmins = []
) { ) {
class { 'openstack_project::server':
iptables_public_tcp_ports => [22, 80, 443],
sysadmins => $sysadmins
}
class { 'etherpad_lite': class { 'etherpad_lite':
ep_ensure => 'latest', ep_ensure => 'latest',
} }