Merge "Support xenial on etherpad and etherpad-dev"
This commit is contained in:
commit
fc31ed82a1
@ -391,7 +391,8 @@ node /^ethercalc\d+\.openstack\.org$/ {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Node-OS: trusty
|
# Node-OS: trusty
|
||||||
node 'etherpad.openstack.org' {
|
# Node-OS: xenial
|
||||||
|
node /^etherpad\d*\.openstack\.org$/ {
|
||||||
class { 'openstack_project::server':
|
class { 'openstack_project::server':
|
||||||
iptables_public_tcp_ports => [22, 80, 443],
|
iptables_public_tcp_ports => [22, 80, 443],
|
||||||
sysadmins => hiera('sysadmins', []),
|
sysadmins => hiera('sysadmins', []),
|
||||||
@ -408,7 +409,8 @@ node 'etherpad.openstack.org' {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Node-OS: trusty
|
# Node-OS: trusty
|
||||||
node 'etherpad-dev.openstack.org' {
|
# Node-OS: xenial
|
||||||
|
node /^etherpad-dev\d*\.openstack\.org$/ {
|
||||||
class { 'openstack_project::server':
|
class { 'openstack_project::server':
|
||||||
iptables_public_tcp_ports => [22, 80, 443],
|
iptables_public_tcp_ports => [22, 80, 443],
|
||||||
sysadmins => hiera('sysadmins', []),
|
sysadmins => hiera('sysadmins', []),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user