(role/puppetdb) bump postgresql to 15

And switch from the pgdg packages to appstream.
lsst-it · Mar 28, 2024 · 5250384 · 5250384
1 parent bcd7a02
commit 5250384
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/hieradata/role/puppetdb.yaml b/hieradata/role/puppetdb.yaml
@@ -3,8 +3,11 @@ classes:
   - "profile::core::common"
   - "puppetdb"
 
+postgresql::globals::manage_dnf_module: true  # use appstream packages
 puppetdb::database_listen_address: "localhost"
 puppetdb::globals::version: "7.14.0"
+puppetdb::manage_package_repo: false
+puppetdb::postgres_version: "15"
 puppetdb::java_args:
   "-Xmx": "1g"
   "-Xms": "512m"

diff --git a/spec/hosts/roles/puppetdb_spec.rb b/spec/hosts/roles/puppetdb_spec.rb
@@ -5,8 +5,26 @@
 PUPPETDB_VERSION = '7.14.0'
 
 shared_examples 'puppetdb' do
-  it { is_expected.to contain_yum__versionlock('puppetdb').with_version(PUPPETDB_VERSION) }
   it { is_expected.to contain_class('puppetdb::globals').with_version(PUPPETDB_VERSION) }
+  it { is_expected.to contain_yum__versionlock('puppetdb').with_version(PUPPETDB_VERSION) }
+
+  it do
+    is_expected.to contain_class('puppetdb').with(
+      listen_address: '0.0.0.0',
+      java_args: {
+        '-Xmx' => '1g',
+        '-Xms' => '512m',
+      },
+    )
+  end
+
+  it do
+    is_expected.to contain_class('postgresql::globals').with(
+      manage_package_repo: false,
+      manage_dnf_module: true,
+      version: '15',
+    )
+  end
 end
 
 role = 'puppetdb'