opendev/system-config
Code Issues Proposed changes

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

Browse Source 
Change-Id: Ia49ee6c3bbf41c03041856aa55f81e7a4c1699bf
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2015-12-02 17:35:36 -05:00
parent c692b5b813
commit 1eb8cfacdc
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/site.pp
View File

@ -838,8 +838,16 @@ node 'zuul-dev.openstack.org' {
# Node-OS: trusty # Node-OS: trusty
node 'pbx.openstack.org' { 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': class { 'openstack_project::pbx':
sysadmins => hiera('sysadmins', []),
sip_providers => [ sip_providers => [
{ {
provider => 'voipms', provider => 'voipms',

11
modules/openstack_project/manifests/pbx.pp
View File

@ -16,19 +16,8 @@
# #
# == Class: openstack_project::pbx # == Class: openstack_project::pbx
class openstack_project::pbx ( class openstack_project::pbx (
$sysadmins = [],
$sip_providers = [], $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 ( realize (
User::Virtual::Localuser['rbryant'], User::Virtual::Localuser['rbryant'],
User::Virtual::Localuser['pabelanger'], User::Virtual::Localuser['pabelanger'],