Skip to content

Support for upstream postgresql.org zypp repo #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 6, 2018
Merged

Support for upstream postgresql.org zypp repo #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions pillar.example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
postgres:
# Set True to configure upstream postgresql.org repository for YUM or APT
# UPSTREAM REPO
# Set True to configure upstream postgresql.org repository for YUM/APT/ZYPP
use_upstream_repo: False
# Version to install from upstream repository
version: '9.3'

# These are Debian/Ubuntu specific package names
pkg: 'postgresql-9.3'
pkg_client: 'postgresql-client-9.3'

# Additional packages to install with PostgreSQL server,
# this should be in a list format
# Version to install from upstream repository (if upstream_repo: True)
version: '9.6'

# PACKAGE
# These pillars are typically never required.
# pkg: 'postgresql'
# pkg_client: 'postgresql-client'
# service: postgresql
pkgs_extra:
- postgresql-contrib
- postgresql-plpython

# POSTGRES
# Append the lines under this item to your postgresql.conf file.
# Pay attention to indent exactly with 4 spaces for all lines.
postgresconf: |
Expand Down Expand Up @@ -48,9 +49,6 @@ postgres:
config_backup: ".backup@{{ salt['status.time']('%y-%m-%d_%H:%M:%S') }}"
{%- endif %}

# PostgreSQL service name
service: postgresql

{%- if grains['init'] == 'unknown' %}

# If Salt is unable to detect init system running in the scope of state run,
Expand Down
37 changes: 35 additions & 2 deletions postgres/osmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,43 @@ RedHat:
{% endif %}

Suse:
pkg_repo:
name: pgdg-sles-{{ release }}
humanname: PostgreSQL {{ repo.version }} $releasever - $basearch
#Using sles-12 upstream repo for opensuse
baseurl: 'https://download.postgresql.org/pub/repos/zypp/{{ repo.version }}/suse/sles-12-$basearch'
key_url: 'https://download.postgresql.org/pub/repos/zypp/{{ repo.version }}/suse/sles-12-$basearch/repodata/repomd.xml.key'
gpgcheck: 1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just add

    gpgautoimport: True

bellow, and importing GPG key from the upstream will start to magically work. No need for additional cmd.run state in the upstream.sls.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks - done - let me know when your PR comments are done and I'll do some retesting on Suse to make sure there is no regression.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool!

gpgautoimport: True

{% if repo.use_upstream_repo %}
{# Pillars needed are 'use_upstream_repo: True' and 'version: n.n'. #}
{# Avoid setting package names as pillars, as may corrupt postgres. #}
{% set lib_dir = '/var/lib/pgsql/' ~ repo.version ~ '/data' %}

pkg: postgresql{{ release }}-server
pkg_client: postgresql{{ release }}
conf_dir: {{ lib_dir }}
service: postgresql-{{ repo.version }}

#This is postgresql-libs in defaults.yml but upstream is libpqxx
pkg_libpq_dev: libpqxx
pkg_dev: postgresql{{ release }}-devel
pkg_libs: postgresql{{ release }}-libs

prepare_cluster:
#Full path needed as initdb is NOT 'cross version compatible' binary
command: /usr/pgsql-{{ repo.version }}/bin/initdb --pgdata='{{ lib_dir }}'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is generally OK. But I would recommend you to consider providing bin_dir and *_bins parameters similar to RedHat section for postgres.manage state to work on Suse out of the box as well.
But that could be added later.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#189

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also #190 captures problem regarding package names in pillar data.

test: test -f '{{ lib_dir }}/PG_VERSION'

{% else %}

pkg: postgresql-server
pkg_client: postgresql
pkg_libpq_dev: postgresql
pkg_libpq_dev: libqpxx
pkg_libs: postgresql-libs

{% endif %}

MacOS:
service: postgresql
Expand All @@ -109,5 +143,4 @@ MacOS:
user: _postgres
group: _postgres


# vim: ft=sls