Conform to strict_variables

pcfens · Feb 23, 2017 · ede4c4a · ede4c4a
1 parent 8afca8d
commit ede4c4a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,7 @@ matrix:
  - rvm: 2.3.1
  bundler_args: --without development
  dist: trusty
- env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true
+ env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true STRICT_VARIABLES=yes
  script: bundle exec rake beaker
  services: docker
  sudo: required
@@ -40,7 +40,7 @@ matrix:
  script: bundle exec rake rubocop
  - rvm: 2.1.9
  bundler_args: --without system_tests development
- env: PUPPET_GEM_VERSION="~> 4.5" STRICT_VARIABLES="yes"
+ env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES=yes
  - rvm: 2.1.9
  bundler_args: --without system_tests development
  env: PUPPET_GEM_VERSION="~> 3.8"

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -90,7 +90,7 @@
 
  validate_bool($manage_repo, $prospectors_merge)
 
- if $major_version == undef and $::filebeat_version == undef {
+ if $major_version == undef and getvar('::filebeat_version') == undef {
  $real_version = '5'
  } elsif $major_version == undef and versioncmp($::filebeat_version, '5.0.0') >= 0 {
  $real_version = '5'