Fixes #6143 and #5823 - support RHEL 7 and correct rhsm.conf config value

Puppetfile.lock

@@ -14,7 +14,7 @@ FORGE
 GIT
   remote: https://github.com/Katello/puppet-candlepin
   ref: master
-  sha: 7ee0194b6b0471e698f620042e44745f4c2539d3
+  sha: a5bc5ea67088e205409919f4db25f55f2a12633d
   specs:
     katello/candlepin (0.0.1)
 
@@ -28,7 +28,7 @@ GIT
 GIT
   remote: https://github.com/Katello/puppet-certs
   ref: master
-  sha: bc1f86cd177b3b3a89bb0cb1c912ccd7396daccb
+  sha: 22fb55c34a04ee74f75e57eba1d7f321e967a327
   specs:
     katello/certs (0.0.1)
 
@@ -49,7 +49,7 @@ GIT
 GIT
   remote: https://github.com/Katello/puppet-katello
   ref: master
-  sha: 6920fa2d744e47d5944411dec3f4a0943504c7b7
+  sha: 4fc5b6295bf61f4db055929d246ddb96195cc33c
   specs:
     katello/katello (0.0.1)
 
@@ -109,7 +109,7 @@ GIT
 GIT
   remote: https://github.com/puppetlabs/puppetlabs-postgresql
   ref: master
-  sha: dcd1741c0378e2261b9c7ba57e6477db14ace649
+  sha: 5d4ecb1b04c908fdc274c14e0e93276c8b132d2e
   specs:
     puppetlabs/postgresql (3.3.3)
       puppetlabs/apt (< 2.0.0, >= 1.1.0)

modules/candlepin/manifests/params.pp

@@ -1,12 +1,13 @@
 # Candlepin params
 class candlepin::params {
 
-  case $::operatingsystem {
-    'Fedora': {
-      $tomcat = 'tomcat'
-    }
-    default: {
-      $tomcat = 'tomcat6'
+  $tomcat = $::osfamily ? {
+    /^(RedHat|Linux)/ => $::operatingsystem ? {
+      'Fedora'  => 'tomcat',
+      default   => $::operatingsystemrelease ? {
+        /^7\./  => 'tomcat',
+        default => 'tomcat6'
+      }
     }
   }
 

modules/certs/manifests/params.pp

@@ -1,12 +1,13 @@
 # Certs Parameters
 class certs::params {
 
-  case $::operatingsystem {
-    'Fedora': {
-      $tomcat = 'tomcat'
-    }
-    default: {
-      $tomcat = 'tomcat6'
+  $tomcat = $::osfamily ? {
+    /^(RedHat|Linux)/ => $::operatingsystem ? {
+      'Fedora'  => 'tomcat',
+      default   => $::operatingsystemrelease ? {
+        /^7\./  => 'tomcat',
+        default => 'tomcat6'
+      }
     }
   }
 

modules/certs/templates/rhsm-katello-reconfigure.erb

@@ -57,6 +57,13 @@ else
   sed -i "s|^baseurl\s*=.*|baseurl=$BASEURL|g" $CFG
 fi
 
+if grep --quiet full_refresh_on_yum $CFG; then
+  sed -i "s/full_refresh_on_yum\s*=.*$/full_refresh_on_yum = 1/g"
+else
+  full_refresh_config="#config for on-premise management\nfull_refresh_on_yum = 1"
+  sed -i "s/baseurl.*/&\n\n$full_refresh_config/g" $CFG
+fi
+
 # restart goferd if it is installed and running
 [ -f /etc/init.d/goferd ] && \
   service goferd status >/dev/null && \

modules/katello/manifests/params.pp

@@ -55,8 +55,6 @@
   $foreman_oauth_key = 'foreman'
   $oauth_token_file = 'katello_oauth_secret'
   $oauth_secret = cache_data($oauth_token_file, random_password(32))
-
-  $post_sync_token_file = '/etc/katello/post_sync_token'
   $post_sync_token = cache_data('post_sync_token', random_password(32))
 
   # Subsystems settings

modules/katello/templates/etc/httpd/conf.d/05-foreman.d/katello.conf.erb

@@ -8,7 +8,11 @@ Alias /pub /var/www/html/pub
 <Location /pub>
   PassengerEnabled off 
   Options +FollowSymLinks +Indexes
+<% if ( @operatingsystem == "RedHat" && operatingsystemmajrelease == "7" ) -%>
+  Require all granted
+<% else -%>
   Allow from all
+<% end -%>
 </Location>
 
 Include /etc/pulp/vhosts80/*.conf

modules/katello/templates/katello.yml.erb

@@ -25,7 +25,7 @@ common:
   use_ssl: true
   use_foreman: <%= scope.lookupvar("katello::params::use_foreman") %>
 
-  post_sync_url: https://localhost<%= scope.lookupvar("katello::params::deployment_url") %>/api/v2/repositories/sync_complete?token=<%= scope.lookupvar("post_sync_token") %>
+  post_sync_url: https://localhost<%= scope.lookupvar("katello::params::deployment_url") %>/api/v2/repositories/sync_complete?token=<%= scope.lookupvar("katello::post_sync_token") %>
 
   candlepin:
     url: <%= scope.lookupvar("katello::params::candlepin_url") %>

modules/postgresql/manifests/globals.pp

@@ -69,6 +69,7 @@
       'Debian' => $::operatingsystemrelease ? {
         /^6\./ => '8.4',
         /^(wheezy|7\.)/ => '9.1',
+        /^(jessie|8\.)/ => '9.3',
         default => undef,
       },
       'Ubuntu' => $::operatingsystemrelease ? {
@@ -92,12 +93,13 @@
   }
 
   $default_postgis_version = $globals_version ? {
-    '8.1' => '1.3.6',
-    '8.4' => '1.5',
-    '9.0' => '1.5',
-    '9.1' => '1.5',
-    '9.2' => '2.0',
-    '9.3' => '2.1',
+    '8.1'   => '1.3.6',
+    '8.4'   => '1.5',
+    '9.0'   => '1.5',
+    '9.1'   => '1.5',
+    '9.2'   => '2.0',
+    '9.3'   => '2.1',
+    default => undef,
   }
   $globals_postgis_version = pick($postgis_version, $default_postgis_version)
 

modules/postgresql/manifests/lib/java.pp

@@ -10,6 +10,7 @@
   package { 'postgresql-jdbc':
     ensure => $package_ensure,
     name   => $package_name,
+    tag    => 'postgresql',
   }
 
 }

modules/postgresql/manifests/server/db.pp

@@ -35,7 +35,7 @@
       privilege => $grant,
       db        => $dbname,
       role      => $user,
-    }
+    } -> Postgresql::Validate_db_connection<| database_name == $dbname |>
   }
 
   if($tablespace != undef and defined(Postgresql::Server::Tablespace[$tablespace])) {

modules/postgresql/spec/unit/classes/lib/java_spec.rb

@@ -11,7 +11,8 @@
     end
     it { should contain_package('postgresql-jdbc').with(
       :name   => 'libpostgresql-jdbc-java',
-      :ensure => 'present'
+      :ensure => 'present',
+      :tag    => 'postgresql'
     )}
   end
 
@@ -24,15 +25,17 @@
     end
     it { should contain_package('postgresql-jdbc').with(
       :name => 'postgresql-jdbc',
-      :ensure => 'present'
+      :ensure => 'present',
+      :tag    => 'postgresql'
     )}
     describe 'when parameters are supplied' do
       let :params do
         {:package_ensure => 'latest', :package_name => 'somepackage'}
       end
       it { should contain_package('postgresql-jdbc').with(
         :name => 'somepackage',
-        :ensure => 'latest'
+        :ensure => 'latest',
+        :tag    => 'postgresql'
       )}
     end
   end