saltstack-formulas/postgres-formula
1
0
Fork 0
mirror of https://github.com/saltstack-formulas/postgres-formula.git synced 2025-04-16 01:30:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #188 from vutny/fix-mock-test-run

Browse source 
Do not fail states during mock test mode
This commit is contained in:
N 2018-03-06 13:53:04 +00:00 • committed by GitHub
commit c727fa5ea1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
postgres/macros.jinja
View file

@ -23,6 +23,8 @@
{{ state }}-{{ name }}: {{ state }}-{{ name }}:
{{ state }}.{{ ensure|default('present') }}: {{ state }}.{{ ensure|default('present') }}:
{{- format_kwargs(kwarg) }} {{- format_kwargs(kwarg) }}
- onchanges:
- test: postgres-reload-modules
{%- endmacro %} {%- endmacro %}

16
postgres/manage.sls
View file

@ -18,7 +18,7 @@ include:
# Ensure that Salt is able to use postgres modules # Ensure that Salt is able to use postgres modules
postgres-reload-modules: postgres-reload-modules:
test.nop: test.succeed_with_changes:
- reload_modules: True - reload_modules: True
# User states # User states
@ -26,8 +26,6 @@ postgres-reload-modules:
{%- for name, user in postgres.users|dictsort() %} {%- for name, user in postgres.users|dictsort() %}
{{ format_state(name, 'postgres_user', user) }} {{ format_state(name, 'postgres_user', user) }}
- require:
- test: postgres-reload-modules
{%- endfor %} {%- endfor %}
@ -36,9 +34,8 @@ postgres-reload-modules:
{%- for name, tblspace in postgres.tablespaces|dictsort() %} {%- for name, tblspace in postgres.tablespaces|dictsort() %}
{{ format_state(name, 'postgres_tablespace', tblspace) }} {{ format_state(name, 'postgres_tablespace', tblspace) }}
- require:
- test: postgres-reload-modules
{%- if 'owner' in tblspace %} {%- if 'owner' in tblspace %}
- require:
- postgres_user: postgres_user-{{ tblspace.owner }} - postgres_user: postgres_user-{{ tblspace.owner }}
{%- endif %} {%- endif %}
@ -49,8 +46,9 @@ postgres-reload-modules:
{%- for name, db in postgres.databases|dictsort() %} {%- for name, db in postgres.databases|dictsort() %}
{{ format_state(name, 'postgres_database', db) }} {{ format_state(name, 'postgres_database', db) }}
{%- if 'owner' in db or 'tablespace' in db %}
- require: - require:
- test: postgres-reload-modules {%- endif %}
{%- if 'owner' in db %} {%- if 'owner' in db %}
- postgres_user: postgres_user-{{ db.owner }} - postgres_user: postgres_user-{{ db.owner }}
{%- endif %} {%- endif %}
@ -65,9 +63,8 @@ postgres-reload-modules:
{%- for name, schema in postgres.schemas|dictsort() %} {%- for name, schema in postgres.schemas|dictsort() %}
{{ format_state(name, 'postgres_schema', schema) }} {{ format_state(name, 'postgres_schema', schema) }}
- require:
- test: postgres-reload-modules
{%- if 'owner' in schema %} {%- if 'owner' in schema %}
- require:
- postgres_user: postgres_user-{{ schema.owner }} - postgres_user: postgres_user-{{ schema.owner }}
{%- endif %} {%- endif %}
@ -78,8 +75,9 @@ postgres-reload-modules:
{%- for name, extension in postgres.extensions|dictsort() %} {%- for name, extension in postgres.extensions|dictsort() %}
{{ format_state(name, 'postgres_extension', extension) }} {{ format_state(name, 'postgres_extension', extension) }}
{%- if 'maintenance_db' in extension or 'schema' in extension %}
- require: - require:
- test: postgres-reload-modules {%- endif %}
{%- if 'maintenance_db' in extension %} {%- if 'maintenance_db' in extension %}
- postgres_database: postgres_database-{{ extension.maintenance_db }} - postgres_database: postgres_database-{{ extension.maintenance_db }}
{%- endif %} {%- endif %}