Merge pull request #9 from jburel/psql15

Psql15

Author: sbesson

.github/workflows/molecule.yml

@@ -32,7 +32,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.8'
+          python-version: '3.9'
       - name: Install Ansible & Molecule
         run: |
             pip install "ansible<8" "ansible-lint<6.13" flake8

README.md

@@ -13,7 +13,8 @@ Role Variables
 --------------
 
 Required:
-- `postgresql_version`: The PostgreSQL major version, e.g. `12`, `13`, `14`
+
+- `postgresql_version`: The PostgreSQL major version, e.g. `11`, `12`, `13`, `14`, `15`, `16`
 
 Optional:
 - `postgresql_package_version`: The PostgreSQL full version, ignored on Ubuntu, e.g. `12.11`

meta/main.yml

@@ -4,7 +4,7 @@ galaxy_info:
   description: Upstream PostgreSQL client
   company: Open Microscopy Environment
   license: BSD
-  min_ansible_version: 2.6
+  min_ansible_version: '2.10'
   platforms:
     - name: EL
       versions:
@@ -15,5 +15,3 @@ galaxy_info:
   namespace: ome
   role_name: postgresql_client
   galaxy_tags: ['postgresql', 'database']
-
-dependencies: []

molecule/rockylinux9/molecule.yml

@@ -14,6 +14,10 @@ platforms:
     image: rockylinux:9
   - name: postgresql14
     image: rockylinux:9
+  - name: postgresql15
+    image: rockylinux:9
+  - name: postgresql16
+    image: rockylinux:9
 provisioner:
   name: ansible
   lint:
@@ -27,6 +31,10 @@ provisioner:
         postgresql_version: "13"
       postgresql14:
         postgresql_version: "14"
+      postgresql15:
+        postgresql_version: "15"
+      postgresql16:
+        postgresql_version: "16"
   playbooks:
     converge: ../resources/playbook.yml
 scenario:

molecule/ubuntu2204/molecule.yml

@@ -14,6 +14,10 @@ platforms:
     image: ubuntu:22.04
   - name: postgresql14
     image: ubuntu:22.04
+  - name: postgresql15
+    image: ubuntu:22.04
+  - name: postgresql16
+    image: ubuntu:22.04
 provisioner:
   name: ansible
   lint:
@@ -26,6 +30,10 @@ provisioner:
         postgresql_version: "13"
       postgresql14:
         postgresql_version: "14"
+      postgresql15:
+        postgresql_version: "15"
+      postgresql16:
+        postgresql_version: "16"
   playbooks:
     converge: ../resources/playbook.yml
 scenario:

tasks/debian.yml

@@ -1,26 +1,26 @@
 ---
 
-- name: postgres | install gpg for apt repo
+- name: Postgres | install gpg for apt repo
   become: true
   ansible.builtin.apt:
     update_cache: true
     name: gnupg
     state: present
 
-- name: postgres | get postgresql apt key
+- name: Postgres | get postgresql apt key
   become: true
-  apt_key:
+  ansible.builtin.apt_key:
     url: https://www.postgresql.org/media/keys/ACCC4CF8.asc
     state: present
 
-- name: postgres | setup apt repo
+- name: Postgres | setup apt repo
   become: true
-  apt_repository:
+  ansible.builtin.apt_repository:
     codename: "{{ ansible_distribution_release }}"
     repo: deb http://apt.postgresql.org/pub/repos/apt/
           {{ ansible_distribution_release }}-pgdg main
 
-- name: postgres | install client packages
+- name: Postgres | install client packages
   become: true
   ansible.builtin.apt:
     update_cache: true

tasks/main.yml

@@ -1,7 +1,9 @@
 ---
 
-- import_tasks: redhat.yml
+- name: Import tasks for redhat
+  ansible.builtin.import_tasks: redhat.yml
   when: ansible_os_family | lower == 'redhat'
 
-- import_tasks: debian.yml
+- name: Import tasks for debian
+  ansible.builtin.import_tasks: debian.yml
   when: ansible_os_family | lower == 'debian'

tasks/redhat.yml

@@ -12,7 +12,7 @@
     key: https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-AARCH64-RHEL
   when: ansible_facts.get('architecture') is search("aarch64")
 
-- name: postgres | setup dnf repository for arch64
+- name: Postgres | setup dnf repository for arch64
   become: true
   ansible.builtin.dnf:
     update_cache: true
@@ -21,7 +21,7 @@
     state: present
   when: ansible_facts.get('architecture') is search("aarch64")
 
-- name: postgres | setup dnf repository for amd64
+- name: Postgres | setup dnf repository for amd64
   become: true
   ansible.builtin.dnf:
     update_cache: true
@@ -30,7 +30,7 @@
     state: present
   when: ansible_facts.get('architecture') is search("x86_64")
 
-- name: postgres | install client packages
+- name: Postgres | install client packages
   become: true
   ansible.builtin.dnf:
     update_cache: true

vars/main.yml

@@ -4,14 +4,6 @@
 # DEPRECATED
 # This variable includes information used by the postgresql (server) role
 postgresql_distribution_redhat:
-  "9.6":
-    repo: pgdg96
-    basename: postgresql96
-    setup: postgresql96-setup
-  "11":
-    repo: pgdg11
-    basename: postgresql11
-    setup: postgresql-11-setup
   "12":
     repo: pgdg12
     basename: postgresql12
@@ -24,3 +16,11 @@ postgresql_distribution_redhat:
     repo: pgdg14
     basename: postgresql14
     setup: postgresql-14-setup
+  "15":
+    repo: pgdg15
+    basename: postgresql15
+    setup: postgresql-15-setup
+  "16":
+    repo: pgdg16
+    basename: postgresql16
+    setup: postgresql-16-setup