bundles/postgresql: some improvements

bundles/postgresql/files/postgresql.conf

@@ -27,7 +27,7 @@ log_min_duration_statement = -1
 % endif
 effective_io_concurrency = ${effective_io_concurrency}
 max_worker_processes = ${max_worker_processes}
-% if version_list >= [10]:
+% if version >= 10:
 max_parallel_workers = ${max_parallel_workers}
 % endif
 max_parallel_workers_per_gather = ${max_parallel_workers_per_gather}

bundles/postgresql/items.py

@@ -45,7 +45,7 @@ files = {
     "/etc/postgresql/{}/main/postgresql.conf".format(postgresql_version): {
         'content_type': 'mako',
         'context': {
-            'version_list': [int(i) for i in node.metadata['postgresql']['version'].split('.')],
+            'version': postgresql_version,
             **node.metadata['postgresql'],
         },
         'owner': 'postgres',

bundles/postgresql/metadata.py

@@ -1,4 +1,13 @@
 defaults = {
+    'apt': {
+        'repos': {
+            'postgresql': {
+                'items': {
+                    'deb https://apt.postgresql.org/pub/repos/apt/ {os_release}-pgdg main',
+                },
+            },
+        },
+    },
     'backups': {
         'paths': {
             '/var/lib/postgresql',
@@ -69,34 +78,6 @@ else:
     defaults['backups']['paths'].add('/var/tmp/postgresdumps')
 
 
-@metadata_reactor.provides(
-    'apt/repos/postgresql',
-)
-def default_postgresql_version_for_debian(metadata):
-    # <https://packages.debian.org/search?keywords=postgresql>
-    versions_in_debian = {
-        '10': '11', # buster
-        '11': '13', # bullseye
-    }
-    os = str(node.os_version[0])
-    version_to_be_installed = metadata.get('postgresql/version')
-
-    if version_to_be_installed != versions_in_debian[os]:
-        return {
-            'apt': {
-                'repos': {
-                    'postgresql': {
-                        'items': {
-                            'deb https://apt.postgresql.org/pub/repos/apt/ {os_release}-pgdg main',
-                        },
-                    },
-                },
-            },
-        }
-
-    return {}
-
-
 @metadata_reactor.provides(
     'postgresql/effective_io_concurrency',
     'postgresql/max_worker_processes',