diff options
| author | Tim Flink <tflink@fedoraproject.org> | 2015-10-05 15:40:47 +0000 |
|---|---|---|
| committer | Tim Flink <tflink@fedoraproject.org> | 2015-10-05 15:40:47 +0000 |
| commit | f282de1c042bf7b3e341e34a930ce7083ff4ee4b (patch) | |
| tree | 56fad7cc999d5d074f8b823f70c9ef854cac0520 | |
| parent | 029119e78bad26b0c70c4965b5a9e5a7d735adb6 (diff) | |
| download | ansible-f282de1c042bf7b3e341e34a930ce7083ff4ee4b.tar.gz ansible-f282de1c042bf7b3e341e34a930ce7083ff4ee4b.tar.xz ansible-f282de1c042bf7b3e341e34a930ce7083ff4ee4b.zip | |
adding missing vars to resultsdb-dev, refactoring execdb settings
| -rw-r--r-- | inventory/group_vars/resultsdb-dev | 4 | ||||
| -rw-r--r-- | roles/taskotron/execdb/templates/settings.py.j2 | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/inventory/group_vars/resultsdb-dev b/inventory/group_vars/resultsdb-dev index d03a32def..fc37194da 100644 --- a/inventory/group_vars/resultsdb-dev +++ b/inventory/group_vars/resultsdb-dev @@ -28,6 +28,7 @@ resultsdb_fe_endpoint: 'resultsdb' resultsdb_db_name: resultsdb_dev resultsdb_db_user: "{{ dev_resultsdb_db_user }}" resultsdb_db_password: "{{ dev_resultsdb_db_password }}" +resultsdb_secret_key: "{{ dev_resultsdb_secret_key }}" allowed_hosts: - 10.5.124 @@ -43,5 +44,4 @@ execdb_endpoint: 'execdb' execdb_db_name: execdb_dev execdb_db_user: "{{ dev_execdb_db_user }}" execdb_db_password: "{{ dev_execdb_db_password }}" - - +execdb_secret_key: "{{ dev_execdb_secret_key }}" diff --git a/roles/taskotron/execdb/templates/settings.py.j2 b/roles/taskotron/execdb/templates/settings.py.j2 index 6075840ca..9494fe200 100644 --- a/roles/taskotron/execdb/templates/settings.py.j2 +++ b/roles/taskotron/execdb/templates/settings.py.j2 @@ -6,13 +6,9 @@ SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://{{ prod_execdb_db_user }}:{{ pr SECRET_KEY = '{{ stg_execdb_secret_key }}' SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://{{ stg_execdb_db_user }}:{{ stg_execdb_db_password }}@{{ execdb_db_host }}:{{ execdb_db_port }}/{{ execdb_db_name }}' {% endif %} -{%- if deployment_type == 'dev' %} -SECRET_KEY = '{{ dev_execdb_secret_key }}' -SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://{{ dev_execdb_db_user }}:{{ dev_execdb_db_password }}@{{ execdb_db_host }}:{{ execdb_db_port }}/{{ execdb_db_name }}' -{% endif %} -{%- if deployment_type == 'local' %} -SECRET_KEY = '{{ local_execdb_secret_key }}' -SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://{{ local_execdb_db_user }}:{{ local_execdb_db_password }}@127.0.0.1:{{ execdb_db_port }}/{{ execdb_db_name }}' +{%- if deployment_type == 'dev' or deployment_type == 'local' %} +SECRET_KEY = '{{ execdb_secret_key }}' +SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://{{ execdb_db_user }}:{{ execdb_db_password }}@{{ execdb_db_host }}:{{ execdb_db_port }}/{{ execdb_db_name }}' {% endif %} FILE_LOGGING = False LOGFILR = '/var/log/execdb/execdb.log' |