From c692b5b813f7192e6e028cba1fad1d231d94b9e6 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 2 Dec 2015 16:29:44 -0500 Subject: [PATCH] Migrate pbx.openstack.org to Ubuntu Trusty Centos6 is being deprecated so we need to move to something newer. This will require pbx.o.o to be rebuilt. Change-Id: Id3fc74bf58ba5febac79674e6fd23d6ade3e4bd1 Signed-off-by: Paul Belanger --- manifests/site.pp | 3 +- .../files/pbx/asterisk/asterisk.conf | 97 ------------------- modules/openstack_project/manifests/pbx.pp | 8 -- 3 files changed, 1 insertion(+), 107 deletions(-) delete mode 100644 modules/openstack_project/files/pbx/asterisk/asterisk.conf diff --git a/manifests/site.pp b/manifests/site.pp index 5fbdf14ef1..88c26352f7 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -836,7 +836,7 @@ node 'zuul-dev.openstack.org' { } } -# Node-OS: centos6 +# Node-OS: trusty node 'pbx.openstack.org' { class { 'openstack_project::pbx': sysadmins => hiera('sysadmins', []), @@ -849,7 +849,6 @@ node 'pbx.openstack.org' { outgoing => false, }, ], - selinux_mode => 'enforcing' } } diff --git a/modules/openstack_project/files/pbx/asterisk/asterisk.conf b/modules/openstack_project/files/pbx/asterisk/asterisk.conf deleted file mode 100644 index e7700a8761..0000000000 --- a/modules/openstack_project/files/pbx/asterisk/asterisk.conf +++ /dev/null @@ -1,97 +0,0 @@ -[directories] -astetcdir => /etc/asterisk -astmoddir => /usr/lib64/asterisk/modules -astvarlibdir => /var/lib/asterisk -astdbdir => /var/lib/asterisk -astkeydir => /var/lib/asterisk -astdatadir => /usr/share/asterisk -astagidir => /var/lib/asterisk/agi-bin -astspooldir => /var/spool/asterisk -astrundir => /var/run/asterisk -astlogdir => /var/log/asterisk -astsbindir => /usr/sbin - -[options] -;verbose = 3 -;debug = 3 -;alwaysfork = yes ; Same as -F at startup. -;nofork = yes ; Same as -f at startup. -;quiet = yes ; Same as -q at startup. -;timestamp = yes ; Same as -T at startup. -;execincludes = yes ; Support #exec in config files. -;console = yes ; Run as console (same as -c at startup). -;highpriority = yes ; Run realtime priority (same as -p at - ; startup). -;initcrypto = yes ; Initialize crypto keys (same as -i at - ; startup). -;nocolor = yes ; Disable console colors. -;dontwarn = yes ; Disable some warnings. -;dumpcore = yes ; Dump core on crash (same as -g at startup). -;languageprefix = yes ; Use the new sound prefix path syntax. -;internal_timing = yes -;systemname = my_system_name ; Prefix uniqueid with a system name for - ; Global uniqueness issues. -;autosystemname = yes ; Automatically set systemname to hostname, - ; uses 'localhost' on failure, or systemname if - ; set. -;mindtmfduration = 80 ; Set minimum DTMF duration in ms (default 80 ms) - ; If we get shorter DTMF messages, these will be - ; changed to the minimum duration -;maxcalls = 10 ; Maximum amount of calls allowed. -;maxload = 0.9 ; Asterisk stops accepting new calls if the - ; load average exceed this limit. -;maxfiles = 1000 ; Maximum amount of openfiles. -;minmemfree = 1 ; In MBs, Asterisk stops accepting new calls if - ; the amount of free memory falls below this - ; watermark. -;cache_record_files = yes ; Cache recorded sound files to another - ; directory during recording. -;record_cache_dir = /tmp ; Specify cache directory (used in conjunction - ; with cache_record_files). -;transmit_silence = yes ; Transmit silence while a channel is in a - ; waiting state, a recording only state, or - ; when DTMF is being generated. Note that the - ; silence internally is generated in raw signed - ; linear format. This means that it must be - ; transcoded into the native format of the - ; channel before it can be sent to the device. - ; It is for this reason that this is optional, - ; as it may result in requiring a temporary - ; codec translation path for a channel that may - ; not otherwise require one. -;transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of - ; directly. -runuser = asterisk ; The user to run as. -rungroup = asterisk ; The group to run as. -;lightbackground = yes ; If your terminal is set for a light-colored - ; background. -;forceblackbackground = yes ; Force the background of the terminal to be - ; black, in order for terminal colors to show - ; up properly. -;defaultlanguage = en ; Default language -documentation_language = en_US ; Set the language you want documentation - ; displayed in. Value is in the same format as - ; locale names. -;hideconnect = yes ; Hide messages displayed when a remote console - ; connects and disconnects. -;lockconfdir = no ; Protect the directory containing the - ; configuration files (/etc/asterisk) with a - ; lock. -;stdexten = gosub ; How to invoke the extensions.conf stdexten. - ; macro - Invoke the stdexten using a macro as - ; done by legacy Asterisk versions. - ; gosub - Invoke the stdexten using a gosub as - ; documented in extensions.conf.sample. - ; Default gosub. - -; Changing the following lines may compromise your security. -;[files] -;astctlpermissions = 0660 -;astctlowner = root -;astctlgroup = apache -;astctl = asterisk.ctl - -[compat] -;pbx_realtime=1.6 -;res_agi=1.6 -;app_set=1.6 diff --git a/modules/openstack_project/manifests/pbx.pp b/modules/openstack_project/manifests/pbx.pp index 5832d447a8..37692a1be1 100644 --- a/modules/openstack_project/manifests/pbx.pp +++ b/modules/openstack_project/manifests/pbx.pp @@ -18,7 +18,6 @@ class openstack_project::pbx ( $sysadmins = [], $sip_providers = [], - $selinux_mode = 'enforcing' ) { class { 'openstack_project::server': sysadmins => $sysadmins, @@ -30,19 +29,12 @@ class openstack_project::pbx ( iptables_rules6 => ['-m udp -p udp --dport 10000:20000 -j ACCEPT'], } - if ($::osfamily == 'RedHat') { - class { 'selinux': - mode => $selinux_mode - } - } - realize ( User::Virtual::Localuser['rbryant'], User::Virtual::Localuser['pabelanger'], ) class { 'asterisk': - asterisk_conf_source => 'puppet:///modules/openstack_project/pbx/asterisk/asterisk.conf', modules_conf_source => 'puppet:///modules/openstack_project/pbx/asterisk/modules.conf', }