opendev/system-config
Code Issues Proposed changes

Merge "Break out openstack_project::server from pbx.o.o"

Browse Source
This commit is contained in:
Jenkins 2015-12-04 20:10:27 +00:00 committed by Gerrit Code Review
commit c3fdf7f7d1
2 changed files with 9 additions and 12 deletions
manifests
site.pp
modules/openstack_project/manifests
pbx.pp

10
manifests/site.pp

@ -838,8 +838,16 @@ node 'zuul-dev.openstack.org' {
# Node-OS: trusty
node 'pbx.openstack.org' {
class { 'openstack_project::server':
sysadmins => hiera('sysadmins', []),
# SIP signaling is either TCP or UDP port 5060.
# RTP media (audio/video) uses a range of UDP ports.
iptables_public_tcp_ports => [5060],
iptables_public_udp_ports => [5060],
iptables_rules4 => ['-m udp -p udp --dport 10000:20000 -j ACCEPT'],
iptables_rules6 => ['-m udp -p udp --dport 10000:20000 -j ACCEPT'],
}
class { 'openstack_project::pbx':
sysadmins => hiera('sysadmins', []),
sip_providers => [
{
provider => 'voipms',

11
modules/openstack_project/manifests/pbx.pp

@ -16,19 +16,8 @@
#
# == Class: openstack_project::pbx
class openstack_project::pbx (
$sysadmins = [],
$sip_providers = [],
) {
class { 'openstack_project::server':
sysadmins => $sysadmins,
# SIP signaling is either TCP or UDP port 5060.
# RTP media (audio/video) uses a range of UDP ports.
iptables_public_tcp_ports => [5060],
iptables_public_udp_ports => [5060],
iptables_rules4 => ['-m udp -p udp --dport 10000:20000 -j ACCEPT'],
iptables_rules6 => ['-m udp -p udp --dport 10000:20000 -j ACCEPT'],
}
realize (
User::Virtual::Localuser['rbryant'],
User::Virtual::Localuser['pabelanger'],