Merge pull request #74 from tenso-m/extra

replace pkg_contrib with pkgs_extra
This commit is contained in:
puneet kandhari 2015-11-23 06:54:22 -06:00
commit 7bfde30dde
3 changed files with 7 additions and 4 deletions

View file

@ -8,6 +8,9 @@ postgres:
lookup:
pkg: 'postgresql-9.3'
pkg_client: 'postgresql-client-9.3'
pkgs_extra:
- postgresql-contrib
- postgresql-plpython
pg_hba: '/etc/postgresql/9.3/main/pg_hba.conf'
users:

View file

@ -3,7 +3,7 @@ postgres:
pkg_dev: postgresql-devel
pkg_libpq_dev: postgresql-libs
pkg_client: postgresql-client
pkg_contrib: postgresql-contrib
pkgs_extra:
python: python-psycopg2
service: postgresql
conf_dir: /var/lib/pgsql/data

View file

@ -48,10 +48,10 @@ run-postgresql:
- require:
- pkg: install-postgresql
{% if postgres.pkg_contrib != False %}
install-postgres-contrib:
{% if postgres.pkgs_extra %}
install-postgres-extra:
pkg.installed:
- name: {{ postgres.pkg_contrib }}
- pkgs: {{ postgres.pkgs_extra }}
{% endif %}
{% if postgres.postgresconf %}