Merge pull request #356 from sdodson/travis-ci

Travis ci will now test for lint, syntax, and spec tests.

Author: sdodson

.travis.yml

@@ -0,0 +1,19 @@
+---
+language: ruby
+before_install: rm Gemfile.lock || true
+rvm:
+  - 1.9.3
+script: bundle exec rake test
+env:
+  matrix:
+  - PUPPET_VERSION="~> 3.2.0"
+  - PUPPET_VERSION="~> 3.4.0"
+  - PUPPET_VERSION="~> 3.6.0"
+matrix:
+  include:
+    - rvm: 1.8.7
+      env: PUPPET_VERSION="~> 2.7.0"
+    - rvm: 1.8.7
+      env: PUPPET_VERSION="~> 3.4.0"
+    - rvm: 1.8.7
+      env: PUPPET_VERSION="~> 3.6.0"

Gemfile

@@ -4,6 +4,7 @@ group :test do
   gem "rake"
   gem "puppet", ENV['PUPPET_VERSION'] || '>= 2.7.0'
   gem "puppet-lint"
+  gem 'rspec', '< 3.0.0'
   gem "rspec-puppet", :git => 'https://github.com/rodjek/rspec-puppet.git', :ref => '389f99ef666521fec1b4530fe69dc1ab84a060a8'
   gem "puppet-syntax"
   gem "puppetlabs_spec_helper"

manifests/activemq_keystores.pp

@@ -1,3 +1,19 @@
+# Copyright 2014 Red Hat, Inc., All rights reserved.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+# This class creates a java keystore for ActiveMQ using provided CA, Cert, and
+# Keys
 class openshift_origin::activemq_keystores (
 
   $ca = $::openshift_origin::msgserver_tls_ca,
@@ -27,7 +43,7 @@
   }
   file {"${activemq_confdir}/ssl_credentials":
     ensure => directory,
-    mode   => 0700,
+    mode   => '0700',
   }
   file {"${activemq_confdir}/ssl_credentials/activemq_certificate.pem":
     ensure => file,
@@ -42,7 +58,6 @@
     source => $ca,
   }
 
-
   # ----- Manage Keystore Contents -----
 
   # Each keystore should have a dependency on the PEM files it relies on.
@@ -59,12 +74,12 @@
 
   # Keystore with ActiveMQ cert and private key
   java_ks { 'activemq_cert:keystore':
-    ensure       => latest,
-    certificate  => "${activemq_confdir}/ssl_credentials/activemq_certificate.pem",
-    private_key  => "${activemq_confdir}/ssl_credentials/activemq_private.pem",
-    target       => "${activemq_confdir}/keystore.jks",
-    password     => $keystore_password,
-    require      => [
+    ensure      => latest,
+    certificate => "${activemq_confdir}/ssl_credentials/activemq_certificate.pem",
+    private_key => "${activemq_confdir}/ssl_credentials/activemq_private.pem",
+    target      => "${activemq_confdir}/keystore.jks",
+    password    => $keystore_password,
+    require     => [
       File["${activemq_confdir}/ssl_credentials/activemq_private.pem"],
       File["${activemq_confdir}/ssl_credentials/activemq_certificate.pem"]
     ],
@@ -79,13 +94,13 @@
   file {"${activemq_confdir}/keystore.jks":
     owner   => $activemq_user,
     group   => $activemq_user,
-    mode    => 0600,
+    mode    => '0600',
     require => Java_ks['activemq_cert:keystore'],
   }
   file {"${activemq_confdir}/truststore.jks":
     owner   => $activemq_user,
     group   => $activemq_user,
-    mode    => 0600,
+    mode    => '0600',
     require => Java_ks['activemq_ca:truststore'],
   }
 

manifests/broker.pp

@@ -109,18 +109,18 @@
   }
 
   selinux_fcontext { '/var/www/openshift/broker/httpd/run(/.*)?':
-    ensure   => 'present',
-    seltype  => 'httpd_var_run_t',
+    ensure  => 'present',
+    seltype => 'httpd_var_run_t',
   }
 
   selinux_fcontext { '/var/www/openshift/broker/tmp(/.*)?':
-    ensure   => 'present',
-    seltype  => 'httpd_tmp_t',
+    ensure  => 'present',
+    seltype => 'httpd_tmp_t',
   }
 
   selinux_fcontext { '/var/log/openshift/broker(/.*)?':
-    ensure   => 'present',
-    seltype  => 'httpd_log_t',
+    ensure  => 'present',
+    seltype => 'httpd_log_t',
   }
 
   # Make sure the semanage rules are set up right away.
@@ -234,12 +234,13 @@
       notify  => Service['openshift-broker'],
     }
   }
+  $development_file_present = $::openshift_origin::development_mode ? {
+    true    => present,
+    default => absent,
+  }
   file { '/etc/openshift/development':
-    source  => 'puppet:///modules/openshift_origin/development',
-    ensure  => $::openshift_origin::development_mode ? {
-        true    => present,
-        default => absent,
-      }
+    ensure => $development_file_present,
+    source => 'puppet:///modules/openshift_origin/development',
   }
 
   # SCL and Puppet don't play well together; circumvents the use of the `scl enable ruby193` mechanism while

manifests/console.pp

@@ -51,13 +51,13 @@
       '/var/log/openshift/console(/.*)?',
       '/var/log/openshift/console/httpd(/.*)?',
     ]:
-    ensure   => 'present',
-    seltype  => 'httpd_log_t',
+    ensure  => 'present',
+    seltype => 'httpd_log_t',
   }
 
   selinux_fcontext { '/var/www/openshift/console/httpd/run(/.*)?':
-    ensure   => 'present',
-    seltype  => 'httpd_var_run_t',
+    ensure  => 'present',
+    seltype => 'httpd_var_run_t',
   }
 
   # Add semanage types to dirs before anything else goes into them.

manifests/datastore.pp

@@ -107,7 +107,7 @@
   }
 
   service { 'mongod':
-    require   => [Package['mongodb'], Package['mongodb-server']],
-    enable    => true,
+    require => [Package['mongodb'], Package['mongodb-server']],
+    enable  => true,
   }
 }

manifests/init.pp

@@ -840,7 +840,7 @@
   $msgserver_admin_password             = inline_template('<%= require "securerandom"; SecureRandom.base64 %>'),
   $msgserver_tls_enabled                = 'disabled',
   $msgserver_tls_keystore_password      = 'password',
-  $msgserver_tls_ca                     = "/var/lib/puppet/ssl/certs/ca.pem",
+  $msgserver_tls_ca                     = '/var/lib/puppet/ssl/certs/ca.pem',
   $msgserver_tls_cert                   = inline_template('<%= "/var/lib/puppet/ssl/certs/#{fqdn.downcase}.pem" %>'),
   $msgserver_tls_key                    = inline_template('<%= "/var/lib/puppet/ssl/private_keys/#{fqdn.downcase}.pem" %>'),
   $mcollective_user                     = 'mcollective',

manifests/msgserver.pp

@@ -52,15 +52,15 @@
     require => Package['activemq'],
   }
 
-  if ($::openshift_origin::msgserver_tls_enabled == 'enabled') or ($::openshift_origin::msgserver_tls_enabled == 'strict') { 
+  if ($::openshift_origin::msgserver_tls_enabled == 'enabled') or ($::openshift_origin::msgserver_tls_enabled == 'strict') {
     if ($::openshift_origin::msgserver_tls_ca != '') and ($::openshift_origin::msgserver_tls_key != '') and ($::openshift_origin::msgserver_tls_cert != '') {
-      anchor { 'openshift_origin::msgserver_keystores_begin': } -> 
+      anchor { 'openshift_origin::msgserver_keystores_begin': } ->
       class { 'openshift_origin::activemq_keystores' : } ->
       anchor { 'openshift_origin::msgserver_keystores_end': }
-    
+
       $activemq_openwire_port = '61617'
     } else { fail 'Valid certificate file locations are required when msgserver_tls_enabled is in strict or enabled mode.' }
-  } else { 
+  } else {
     $activemq_openwire_port = '61616'
   }
 

manifests/node.pp

@@ -253,18 +253,18 @@
   }
 
   service { ['openshift-gears']:
-    enable   => true,
-    require  => [
+    enable  => true,
+    require => [
       Package['rubygem-openshift-origin-node'],
       Package['openshift-origin-node-util'],
     ],
   }
 
   if $openshift_origin::conf_node_watchman_service {
     service { ['openshift-watchman']:
-      ensure   => running,
-      enable   => true,
-      require  => [
+      ensure  => running,
+      enable  => true,
+      require => [
         Package['rubygem-openshift-origin-node'],
         Package['openshift-origin-node-util'],
         Service['openshift-gears'],
@@ -281,10 +281,10 @@
   }
 
   file { ['/var/lib/openshift/']:
-    ensure  => 'directory',
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0751',
+    ensure => 'directory',
+    owner  => 'root',
+    group  => 'root',
+    mode   => '0751',
   }
 
   file { ['/var/lib/openshift/.settings','/etc/openshift/env/']:

manifests/register_dns.pp

@@ -41,10 +41,10 @@
 
       $key_argument = "${key_algorithm}:${key_domain}:${key_secret}"
 
-      exec { "Attempting to register host dns" :
-        command   => template('openshift_origin/register_dns.erb'),
-        provider  => 'shell',
-        require   => Package['bind-utils'],
+      exec { 'Attempting to register host dns' :
+        command  => template('openshift_origin/register_dns.erb'),
+        provider => 'shell',
+        require  => Package['bind-utils'],
       }
     }
   }