replace pkg_contrib with pkgs_extra

This commit is contained in:
Roman Inflianskas 2015-11-23 13:56:15 +03:00
parent 4f3e1cb8db
commit d11ba6d14a
3 changed files with 7 additions and 4 deletions

View file

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

View file

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

View file

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