Skip to content
Snippets Groups Projects
Commit 3633a6ec authored by Alexander Weidinger's avatar Alexander Weidinger
Browse files

Allow to remove DB

parent d1de0fdf
No related branches found
No related tags found
No related merge requests found
...@@ -13,19 +13,29 @@ include: ...@@ -13,19 +13,29 @@ include:
{% for database_obj in salt['pillar.get']('mysql:database', []) %} {% for database_obj in salt['pillar.get']('mysql:database', []) %}
{% set state_id = 'mysql_db_' ~ loop.index0 %} {% set state_id = 'mysql_db_' ~ loop.index0 %}
{% set database = database_obj.get('name') if database_obj is mapping else database_obj %} {% if database_obj is mapping %}
{% set database = database_obj.get('name') %}
{% set present = database_obj.get('present', True) %}
{% else %}
{% set database = database_obj %}
{% set present = True %}
{% endif %}
{{ state_id }}: {{ state_id }}:
{%- if present %}
mysql_database.present: mysql_database.present:
{% if database_obj is mapping %}
- character_set: {{ database_obj.get('character_set', '') }}
- collate: {{ database_obj.get('collate', '') }}
{% endif %}
{% else %}
mysql_database.absent:
{% endif %}
- name: {{ database }} - name: {{ database }}
- connection_host: '{{ mysql_host }}' - connection_host: '{{ mysql_host }}'
- connection_user: '{{ mysql_salt_user }}' - connection_user: '{{ mysql_salt_user }}'
{% if mysql_salt_pass %} {% if mysql_salt_pass %}
- connection_pass: '{{ mysql_salt_pass }}' - connection_pass: '{{ mysql_salt_pass }}'
{% endif %} {% endif %}
{% if database_obj is mapping %}
- character_set: {{ database_obj.get('character_set', '') }}
- collate: {{ database_obj.get('collate', '') }}
{% endif %}
- connection_charset: utf8 - connection_charset: utf8
{% if salt['pillar.get'](['mysql', 'schema', database, 'load']|join(':'), False) %} {% if salt['pillar.get'](['mysql', 'schema', database, 'load']|join(':'), False) %}
......
...@@ -72,6 +72,9 @@ mysql: ...@@ -72,6 +72,9 @@ mysql:
- name: bar - name: bar
character_set: utf8 character_set: utf8
collate: utf8_general_ci collate: utf8_general_ci
# Delete DB
- name: obsolete_db
present: False
schema: schema:
foo: foo:
load: True load: True
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment