opendev/system-config
Code Issues Proposed changes

Merge "Upgrade etherpad to Ubuntu Trusty"

Browse Source
This commit is contained in:
Jenkins 2015-09-05 20:31:02 +00:00 committed by Gerrit Code Review
commit 8324375a52
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/site.pp
View File

@ -327,7 +327,7 @@ node 'eavesdrop.openstack.org' {
} }
} }
# Node-OS: precise # Node-OS: trusty
node 'etherpad.openstack.org' { node 'etherpad.openstack.org' {
class { 'openstack_project::server': class { 'openstack_project::server':
iptables_public_tcp_ports => [22, 80, 443], iptables_public_tcp_ports => [22, 80, 443],

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

@ -12,7 +12,8 @@ class openstack_project::etherpad (
) { ) {
class { 'etherpad_lite': class { 'etherpad_lite':
ep_ensure => 'latest', ep_ensure => 'latest',
eplite_version => '2bf16fe09fe9a6af804666d15ff4704620369d9f', eplite_version => 'cc9f88e7ed4858b72feb64c99beb3e13445ab6d9',
nodejs_version => 'system',
} }
class { 'etherpad_lite::apache': class { 'etherpad_lite::apache':