opendev/system-config
Code Issues Proposed changes

Prep for pbx upgrade to xenial

Browse Source 
This sets our testing to test pbx manifest on xenial and adds a hiera
group called pbx to the servers so we can properly do servernames with
digits and have common config in hiera.

Change-Id: I8c3096d18fe318c6ca206203de0ac984c8934566
This commit is contained in:
Clark Boylan 2019-02-13 09:06:58 -08:00
parent be5b02d08f
commit a6703e9e57
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/site.pp
View File

@ -1068,7 +1068,9 @@ node /^zm\d+.open.*\.org$/ {
} }
# Node-OS: trusty # Node-OS: trusty
# Node-OS: xenial
node /^pbx\d*\.open.*\.org$/ { node /^pbx\d*\.open.*\.org$/ {
$group = "pbx"
class { 'openstack_project::server': } class { 'openstack_project::server': }
class { 'openstack_project::pbx': class { 'openstack_project::pbx':
sip_providers => [ sip_providers => [

4
modules/openstack_project/templates/pbx/asterisk/sip.conf.erb
View File

@ -12,12 +12,12 @@ allow=ulaw
allow=alaw allow=alaw
allow=gsm allow=gsm
nat=force_rport,comedia nat=force_rport,comedia
<% sip_providers.each do |provider| -%> <% @sip_providers.each do |provider| -%>
register => <%= provider['username'] %>:<%= provider['password'] %>@<%= provider['hostname'] %>:5060 register => <%= provider['username'] %>:<%= provider['password'] %>@<%= provider['hostname'] %>:5060
<% end -%> <% end -%>
<% sip_providers.each do |provider| -%> <% @sip_providers.each do |provider| -%>
<% if provider['outgoing'] == true -%> <% if provider['outgoing'] == true -%>
[<%= provider['username'] %>] [<%= provider['username'] %>]
context=public context=public