Merge pull request #221 from noelmcloughlin/devpkg

Fix dev package os dependencies
This commit is contained in:
Niels Abspoel 2018-06-18 19:37:57 +02:00 committed by GitHub
commit 501b0b678a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 13 deletions

View file

@ -7,6 +7,7 @@ postgres:
pkgs_extra: [] pkgs_extra: []
pkg_client: postgresql-client pkg_client: postgresql-client
pkg_dev: postgresql-devel pkg_dev: postgresql-devel
pkg_dev_deps: []
pkg_libpq_dev: libpq-dev pkg_libpq_dev: libpq-dev
pkg_libs: postgresql-libs pkg_libs: postgresql-libs
pkg_python: python-psycopg2 pkg_python: python-psycopg2

View file

@ -1,20 +1,12 @@
{% from tpldir + "/map.jinja" import postgres with context %} {% from tpldir + "/map.jinja" import postgres with context %}
{% if grains.os not in ('Windows', 'MacOS',) %} {% if grains.os not in ('Windows', 'MacOS',) %}
{%- set pkgs = [postgres.pkg_dev, postgres.pkg_libpq_dev] + postgres.pkg_dev_deps %}
{% if postgres.pkg_dev %} {% if pkgs %}
install-postgres-dev-package: install-postgres-dev-packages:
pkg.installed: pkg.installed:
- name: {{ postgres.pkg_dev }} - pkgs: {{ pkgs }}
{% if postgres.fromrepo %}
- fromrepo: {{ postgres.fromrepo }}
{% endif %}
{% endif %}
{% if postgres.pkg_libpq_dev %}
install-postgres-libpq-dev:
pkg.installed:
- name: {{ postgres.pkg_libpq_dev }}
{% if postgres.fromrepo %} {% if postgres.fromrepo %}
- fromrepo: {{ postgres.fromrepo }} - fromrepo: {{ postgres.fromrepo }}
{% endif %} {% endif %}

View file

@ -101,6 +101,11 @@ RedHat:
{% endif %} {% endif %}
pkg_libpq_dev: libpqxx-devel pkg_libpq_dev: libpqxx-devel
pkg_dev_deps:
- perl-Time-HiRes
- libicu-devel
- perl-IPC-Run
- perl-Test-Simple
Suse: Suse:
pkg_repo: pkg_repo: