added client formula and required default values

This commit is contained in:
Dominic Ferrantelli 2015-04-21 13:06:41 -07:00
parent b38deb618f
commit f6e68157a3
2 changed files with 27 additions and 0 deletions

24
postgres/client.sls Normal file
View file

@ -0,0 +1,24 @@
{% from "postgres/map.jinja" import postgres with context %}
{% if salt['pillar.get']('postgres:use_upstream_repo') %}
install-postgresql-repo:
pkgrepo.managed:
- humanname: PostgreSQL Official Repository
- name: {{ postgres.pkg_repo }}
- keyid: B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8
- keyserver: keyserver.ubuntu.com
- file: {{ postgres.pkg_repo_file }}
- require_in:
- install-postgresql-client
{% endif %}
install-postgresql-client:
pkg.installed:
- name: {{ postgres.pkg_client }}
- refresh: {{ salt['pillar.get']('postgres:use_upstream_repo', False) }}
{% if postgres.pkg_libpq_dev != False %}
install-postgres-libpq-dev:
pkg.installed:
- name: {{ postgres.pkg_libpq_dev }}
{% endif %}

View file

@ -15,6 +15,7 @@
'pkg' : 'postgresql-server', 'pkg' : 'postgresql-server',
'pkg_dev' : 'postgresql-devel', 'pkg_dev' : 'postgresql-devel',
'pkg_libpq_dev' : 'postgresql-libs', 'pkg_libpq_dev' : 'postgresql-libs',
'pkg_client' : 'postgresql-client',
'python' : 'python-psycopg2', 'python' : 'python-psycopg2',
'service' : 'postgresql', 'service' : 'postgresql',
'conf_dir' : '/var/lib/pgsql/data', 'conf_dir' : '/var/lib/pgsql/data',
@ -26,6 +27,7 @@
'pkg' : 'postgresql', 'pkg' : 'postgresql',
'pkg_dev' : 'postgresql-devel', 'pkg_dev' : 'postgresql-devel',
'pkg_libpq_dev' : 'postgresql-libs', 'pkg_libpq_dev' : 'postgresql-libs',
'pkg_client' : 'postgresql-client',
'python' : 'python-psycopg2', 'python' : 'python-psycopg2',
'service' : 'postgresql', 'service' : 'postgresql',
'conf_dir' : '/var/lib/pgsql/data', 'conf_dir' : '/var/lib/pgsql/data',
@ -37,6 +39,7 @@
'pkg' : 'postgresql-' + pg_version.id, 'pkg' : 'postgresql-' + pg_version.id,
'pkg_dev' : 'postgresql-server-dev-' + pg_version.id, 'pkg_dev' : 'postgresql-server-dev-' + pg_version.id,
'pkg_libpq_dev' : 'libpq-dev', 'pkg_libpq_dev' : 'libpq-dev',
'pkg_client' : 'postgresql-client-'+ pg_version.id,
'pkg_contrib' : 'postgresql-contrib-' + pg_version.id, 'pkg_contrib' : 'postgresql-contrib-' + pg_version.id,
'pkg_repo' : 'deb http://apt.postgresql.org/pub/repos/apt/ ' + grains['lsb_distrib_codename'] + '-pgdg main', 'pkg_repo' : 'deb http://apt.postgresql.org/pub/repos/apt/ ' + grains['lsb_distrib_codename'] + '-pgdg main',
'pkg_repo_file' : '/etc/apt/sources.list.d/pgdg.list', 'pkg_repo_file' : '/etc/apt/sources.list.d/pgdg.list',