CIDM-1712 - Basic Repose 9 Support

Author: scarlettmoonbell

.gemfiles/Gemfile.ruby187.rspec

@@ -1,17 +1,16 @@
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
   - 2.1.1
 
 before_install:
   - rm .gemfiles/Gemfile.rspec.lock || true
-  - rm .gemfiles/Gemfile.ruby187.rspec.lock || true
+  - rm .gemfiles/Gemfile.ruby193.rspec.lock || true
+  - rm .gemfiles/Gemfile.ruby200.rspec.lock || true
 
 gemfile:
   - .gemfiles/Gemfile.rspec
-  - .gemfiles/Gemfile.ruby187.rspec
   - .gemfiles/Gemfile.ruby193.rspec
 
 script:
@@ -35,10 +34,6 @@ env:
 
 matrix:
   exclude:
-    - rvm: 1.8.7
-      gemfile: .gemfiles/Gemfile.rspec
-    - rvm: 1.8.7
-      gemfile: .gemfiles/Gemfile.ruby193.rspec
     - rvm: 1.9.3
       gemfile: .gemfiles/Gemfile.ruby187.rspec
     - rvm: 1.9.3
@@ -51,24 +46,6 @@ matrix:
       gemfile: .gemfiles/Gemfile.ruby187.rspec
     - rvm: 2.1.1
       gemfile: .gemfiles/Gemfile.ruby193.rspec
-    - rvm: 1.8.7
-      env: PUPPET_VERSION="~> 4.0.0"
-    - rvm: 1.8.7
-      env: PUPPET_VERSION="~> 4.1.0"
-    - rvm: 1.8.7
-      env: PUPPET_VERSION="~> 4.2.0"
-    - rvm: 1.8.7
-      env: PUPPET_VERSION="~> 4.3.0"
-    - rvm: 1.8.7
-      env: PUPPET_VERSION="~> 4.4.0"
-    - rvm: 1.8.7
-      env: PUPPET_VERSION="~> 4.5.0"
-    - rvm: 1.8.7
-      env: PUPPET_VERSION="~> 4.6.0"
-    - rvm: 1.8.7
-      env: PUPPET_VERSION="~> 4.7.0"
-    - rvm: 1.8.7
-      env: PUPPET_VERSION="~> 4.8.0"
     - rvm: 1.9.3
       env: PUPPET_VERSION="~> 2.7.0"
     - rvm: 2.0.0

.travis.yml

@@ -152,6 +152,7 @@
   $default_tcp_nodelay                  = true,
   $default_keepalive_timeout            = 0,
   $additional_pools                     = undef,
+  $repose9                              = false,
 ) {
 
 ### Validate parameters

manifests/filter/http_connection_pool.pp

@@ -75,6 +75,13 @@
 # WARNING: This is a Repose version 8 and above feature only.
 # Defaults to <tt>{}</tt> Empty hash
 #
+# [*repose9*]
+# Boolean value which signals the system-model template to leave out the
+# cluster element in support of Repose v.9 and above. This is a half-step
+# measure before supporting the new way Repose handles clustering in the
+# system-model config.
+# Defaults to <tt>false</tt> False
+#
 # === Examples
 #
 # $app_name = 'repose'
@@ -126,6 +133,7 @@
   $endpoints           = undef,
   $port                = $repose::params::port,
   $https_port          = undef,
+  $repose9             = false,
   $rewrite_host_header = undef,
   $service_cluster     = undef,
   $tracing_header      = {},

manifests/filter/system_model.pp

@@ -79,6 +79,7 @@
   $rh_old_packages      = $repose::params::rh_old_packages,
   $cfg_new_namespace    = $repose::params::cfg_new_namespace,
   $experimental_filters = $repose::params::experimental_filters,
+  $identity_filters     = $repose::params::identity_filters,
 ) inherits repose::params {
 
 ### Validate parameters
@@ -163,13 +164,15 @@
     container            => $container,
     rh_old_packages      => $rh_old_packages,
     experimental_filters => $experimental_filters,
+    identity_filters     => $identity_filters,
   }
 
 ## service
-  if $container == 'valve' {
+  if ( $container in [ 'valve', 'repose9' ]) {
     class { 'repose::service':
-      ensure => $ensure,
-      enable => $enable,
+      ensure    => $ensure,
+      enable    => $enable,
+      container => $container,
     }
   }
 

manifests/init.pp

@@ -44,6 +44,10 @@
 # Boolean. Install the experimental filters bundle package
 # Defaults to <tt>false</tt>
 #
+# [*identity_filters*]
+# Boolean. Install the identity filters bundle package
+# Defaults to <tt>false</tt>
+#
 # === Examples
 #
 # Primarily to be used by the repose base class, but you can use:
@@ -65,6 +69,7 @@
   $container                     = $repose::params::container,
   $rh_old_packages               = $repose::params::rh_old_packages,
   $experimental_filters          = $repose::params::experimental_filters,
+  $identity_filters              = $repose::params::identity_filters,
 ) inherits repose::params {
 
 ### Logic
@@ -85,11 +90,14 @@
   $container_package = $container ? {
     'tomcat7' => $repose::params::tomcat7_package,
     'valve'   => $repose::params::valve_package,
+    'repose9'   => $repose::params::repose9_package,
   }
 
 ## Handle adding a dependency of service for valve
   if $container == 'valve' {
     $before = Service[$repose::params::service]
+  } elsif $container == 'repose9' {
+    $before = Service[$repose::params::repose9_service]
   } else {
     $before = undef
   }
@@ -114,7 +122,7 @@
 
   if $experimental_filters == true {
     package { $repose::params::experimental_filters_packages:
-      ensure => $package_ensure, 
+      ensure => $package_ensure,
       require => Package[$container_package],
     }
   } else {
@@ -124,4 +132,11 @@
     }
   }
 
+  if $identity_filters == true {
+    package { $repose::params::identity_filters_packages:
+      ensure => $package_ensure,
+      require => Package[$container_package],
+    }
+  }
+
 }

manifests/package.pp

@@ -43,7 +43,7 @@
   $container = 'valve'
 
 ## container_options
-  $container_options = ['valve','tomcat7']
+  $container_options = ['valve','tomcat7','repose9']
 
 ### Package specific in
 
@@ -52,6 +52,11 @@
     /(RedHat|Debian)/ => 'repose-valve',
   }
 
+## repose 9 service
+  $repose9_service = $::osfamily ? {
+    /(RedHat|Debian)/ => 'repose',
+  }
+
 ## service capabilities
   $service_hasstatus = $::osfamily ? {
     /(RedHat|Debian)/ => true,
@@ -79,6 +84,13 @@
     /(RedHat|Debian)/ => [ 'repose-experimental-filter-bundle' ],
   }
 
+##  identity filters bundle package
+  $identity_filters = false
+
+  $identity_filters_packages = $::osfamily ? {
+    /(RedHat|Debian)/ => [ 'repose-identity-filter-bundle' ],
+  }
+
 ## tomcat7_package
   $tomcat7_package = $::osfamily ? {
     /(RedHat|Debian)/ => 'repose-war',
@@ -89,6 +101,11 @@
     /(RedHat|Debian)/ => 'repose-valve',
   }
 
+## repose9_package
+  $repose9_package = $::osfamily ? {
+    /(RedHat|Debian)/ => 'repose',
+  }
+
 ## configdir
   $configdir = $::osfamily ? {
     /(RedHat|Debian)/ => '/etc/repose',