CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [5.0.0](https://github.com/theforeman/puppet-pulpcore/tree/5.0.0) (2021-07-27)
+
+[Full Changelog](https://github.com/theforeman/puppet-pulpcore/compare/4.0.1...5.0.0)
+
+**Breaking changes:**
+
+- Drop Puppet 5 support [\#197](https://github.com/theforeman/puppet-pulpcore/pull/197) ([ekohl](https://github.com/ekohl))
+
+**Implemented enhancements:**
+
+- Use REDIS\_URL as a configuration option [\#218](https://github.com/theforeman/puppet-pulpcore/pull/218) ([ekohl](https://github.com/ekohl))
+
+**Fixed bugs:**
+
+- Contain Redis within database [\#216](https://github.com/theforeman/puppet-pulpcore/pull/216) ([ekohl](https://github.com/ekohl))
+
 ## [4.0.1](https://github.com/theforeman/puppet-pulpcore/tree/4.0.1) (2021-07-13)
 
 [Full Changelog](https://github.com/theforeman/puppet-pulpcore/compare/4.0.0...4.0.1)

manifests/database.pp

@@ -27,6 +27,6 @@
     require     => Pulpcore::Admin['migrate --noinput'],
   }
 
-  include redis
+  contain redis
 
 }

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "theforeman-pulpcore",
-  "version": "4.0.1",
+  "version": "5.0.0",
   "author": "theforeman",
   "summary": "Installs next generation Pulp server",
   "license": "GPL-3.0-or-later",
@@ -54,7 +54,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 5.5.8 < 8.0.0"
+      "version_requirement": ">= 6.1.0 < 8.0.0"
     }
   ]
 }

spec/classes/pulpcore_spec.rb

@@ -24,6 +24,7 @@
             .with_content(%r{ALLOWED_IMPORT_PATHS = \["/var/lib/pulp/sync_imports"\]})
             .with_content(%r{ALLOWED_CONTENT_CHECKSUMS = \["sha224", "sha256", "sha384", "sha512"\]})
             .with_content(%r{\s'level': 'INFO',})
+            .with_content(%r{REDIS_URL = "redis://localhost:6379/8"})
             .with_content(%r{CACHE_ENABLED = False})
             .without_content(%r{sslmode})
           is_expected.to contain_file('/etc/pulp')
@@ -50,6 +51,7 @@
           is_expected.to contain_exec('pulpcore-manager migrate --noinput')
           is_expected.to contain_pulpcore__admin('reset-admin-password --random')
           is_expected.to contain_exec('pulpcore-manager reset-admin-password --random')
+          is_expected.to contain_class('redis').that_comes_before('Class[pulpcore::service]')
         end
 
         it 'configures apache' do

templates/settings.py.erb

@@ -19,9 +19,7 @@ DATABASES = {
 <% end -%>
     },
 }
-REDIS_HOST = "localhost"
-REDIS_PORT = "<%= scope['redis::port'] %>"
-REDIS_DB = <%= scope['pulpcore::redis_db'] %>
+REDIS_URL = "redis://localhost:<%= scope['redis::port'] %>/<%= scope['pulpcore::redis_db'] %>"
 
 USE_NEW_WORKER_TYPE = <%= scope['pulpcore::use_rq_tasking_system'] ? "False" : "True" %>