From d35a0a57a99fb60f525be19ed10af1b47cf2b806 Mon Sep 17 00:00:00 2001 From: Johan Date: Thu, 28 Dec 2023 13:20:29 +0100 Subject: [PATCH] CT-414: Temporary disable database creation, to get CT environment to run --- vhosting/resources/mysql_database.sls | 40 +++++++++++++-------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/vhosting/resources/mysql_database.sls b/vhosting/resources/mysql_database.sls index b82d653..615394c 100644 --- a/vhosting/resources/mysql_database.sls +++ b/vhosting/resources/mysql_database.sls @@ -1,23 +1,23 @@ -# Create a MySQL Database pair (db + user + grants) -{% macro create(salt, baseconf, owner, params, name) %} -{%- if 'password' in params %} -mysqldb_{{ owner }}_{{ name }}: - mysql_database.present: - - name: {{ name }} - mysql_user.present: - - name: {{ name }} - - password: {{ params.get('password')|json() }} - - host: {{ params.get('host', 'localhost')|json() }} - mysql_grants.present: - - grant: ALL - - database: {{ name }}.* - - user: {{ name }} - - host: {{ params.get('host', 'localhost')|json() }} - require: - - pkg: python-mysqldb - - pkg: mysql-server - - service: mysql-server - - file: salt_mysql_config +# # Create a MySQL Database pair (db + user + grants) +# {% macro create(salt, baseconf, owner, params, name) %} +# {%- if 'password' in params %} +# mysqldb_{{ owner }}_{{ name }}: +# mysql_database.present: +# - name: {{ name }} +# mysql_user.present: +# - name: {{ name }} +# - password: {{ params.get('password')|json() }} +# - host: {{ params.get('host', 'localhost')|json() }} +# mysql_grants.present: +# - grant: ALL +# - database: {{ name }}.* +# - user: {{ name }} +# - host: {{ params.get('host', 'localhost')|json() }} +# require: +# - pkg: python-mysqldb +# - pkg: mysql-server +# - service: mysql-server +# - file: salt_mysql_config {%- if 'hosts' in params %} # Extra grants required