Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update version number in config files to match the installed version #3

Merged
merged 7 commits into from
Oct 5, 2016
Merged

Update version number in config files to match the installed version #3

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8583a77
Update version number in config files to match the installed version
Sep 30, 2016
8b69e64
Fix typo in ver_match variable
Oct 4, 2016
4249a77
Replace match function with regsubst
Oct 5, 2016
8cffb90
Fix Gem install for json_pure
Oct 5, 2016
f5dbe08
Fix regex for generating sem_ver
Oct 5, 2016
f2f2f3a
Fix sem_ver regex for real this time
Oct 5, 2016
f858082
Rename sem_ver variable to lumenvox_version
Oct 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ group :test do
gem "puppet-syntax", :require => false
gem 'metadata-json-lint', :require => false
gem 'simplecov', :require => false
gem 'json', :require => false
gem 'json', '1.8.3', :require => false
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we locking to specific version here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

json and json_pure 2.x don't work with ruby 1.9.3
1.8.3 is the last release before 2.0

gem 'json_pure', '< 2.0.0', :require => false
gem "puppet-blacksmith", :require => false
gem 'puppet-lint', :require => false
gem 'puppet-lint-unquoted_string-check', :require => false
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ PLATFORMS
DEPENDENCIES
facter
hiera
json
json (= 1.8.3)
metadata-json-lint
puppet
puppet-blacksmith
Expand Down
1 change: 1 addition & 0 deletions manifests/client.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
{

$version = $lumenvox::options['client']['version']
$sem_ver = regsubst($version, '^(\d+\.\d+\.\d+)(.*)$','\1')
$license_servers = $lumenvox::options['client']['license_servers']
$sre_servers = $lumenvox::options['client']['sre_servers']
$tts_servers = $lumenvox::options['client']['tts_servers']
Expand Down
2 changes: 1 addition & 1 deletion manifests/license_server.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
class lumenvox::license_server
{

require lumenvox::core
require ::lumenvox::core

$version = $lumenvox::options['license_server']['version']

Expand Down
1 change: 1 addition & 0 deletions manifests/media_server.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
{

$version = $lumenvox::options['media_server']['version']
$sem_ver = regsubst($version, '^(\d+\.\d+\.\d+)(.*)$','\1')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we sure this is sem_ver? Perhaps this is better called $version to make its meaning clear

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The $version variable get's used for installing the package and has extra characters in it that I strip out.
I thought $sem_ver was the best name because it is the version of the release.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, then how about lumenvox_version?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is much better. :)

$mrcp_server_ip = $lumenvox::options['media_server']['mrcp_server_ip']
$enable_sre_logging = $lumenvox::options['media_server']['enable_sre_logging']
$sre_ip = $lumenvox::options['media_server']['sre_ip']
Expand Down
1 change: 1 addition & 0 deletions manifests/sre.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
{

$version = $lumenvox::options['sre']['version']
$sem_ver = regsubst($version, '^(\d+\.\d+\.\d+)(.*)$','\1')
$language_packs = $lumenvox::options['sre']['language_packs']
$logging_verbosity = $lumenvox::options['sre']['logging_verbosity']

Expand Down
1 change: 1 addition & 0 deletions manifests/tts.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

$num_synthesis_threads = $::lumenvox::options['tts']['num_synthesis_threads']
$version = $::lumenvox::options['tts']['version']
$sem_ver = regsubst($version, '^(\d+\.\d+\.\d+)(.*)$','\1')
$voices = $::lumenvox::options['tts']['voices']

package { 'LumenVoxTTS':
Expand Down
4 changes: 2 additions & 2 deletions templates/client_property.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[GLOBAL]
#******************************************************************************#
#* Description: Config file version. Do not modify
#* Default Value: 10.5.200
#* Default Value: <%= @sem_ver %>
#******************************************************************************#
VERSION = 10.5.200
VERSION = <%= @sem_ver %>

#******************************************************************************#
#* Description: This property sets which License Servers are used for
Expand Down
4 changes: 2 additions & 2 deletions templates/media_server.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[GLOBAL]
#******************************************************************************#
#* Description: Config file version. Do not modify
#* Default Value: 10.5.200
#* Default Value: <%= @sem_ver %>
#******************************************************************************#
VERSION = 10.5.200
VERSION = <%= @sem_ver %>

#******************************************************************************#
#* Description: This is the only parameter that you really NEED to set.
Expand Down
4 changes: 2 additions & 2 deletions templates/sre_server.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[GLOBAL]
#******************************************************************************#
#* Description: Config file version. Do not modify
#* Default Value: 10.5.200
#* Default Value: <%= @sem_ver %>
#******************************************************************************#
VERSION = 10.5.200
VERSION = <%= @sem_ver %>

[SRE]
#******************************************************************************#
Expand Down
4 changes: 2 additions & 2 deletions templates/tts_server.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[GLOBAL]
#******************************************************************************#
#* Description: Config file version. Do not modify
#* Default Value: 10.5.200
#* Default Value: <%= @sem_ver %>
#******************************************************************************#
VERSION = 10.5.200
VERSION = <%= @sem_ver %>

#******************************************************************************#
#* Description: Port number used by the tts server to listen for connecting
Expand Down