Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

adding missing vars to resultsdb-dev, refactoring execdb settings

Browse source
This commit is contained in:
Tim Flink 2015-10-05 15:40:47 +00:00
parent 029119e78b
commit f282de1c04
2 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
inventory/group_vars/resultsdb-dev
View file

@ -28,6 +28,7 @@ resultsdb_fe_endpoint: 'resultsdb'
resultsdb_db_name: resultsdb_dev resultsdb_db_name: resultsdb_dev
resultsdb_db_user: "{{ dev_resultsdb_db_user }}" resultsdb_db_user: "{{ dev_resultsdb_db_user }}"
resultsdb_db_password: "{{ dev_resultsdb_db_password }}" resultsdb_db_password: "{{ dev_resultsdb_db_password }}"
resultsdb_secret_key: "{{ dev_resultsdb_secret_key }}"
allowed_hosts: allowed_hosts:
- 10.5.124 - 10.5.124
@ -43,5 +44,4 @@ execdb_endpoint: 'execdb'
execdb_db_name: execdb_dev execdb_db_name: execdb_dev
execdb_db_user: "{{ dev_execdb_db_user }}" execdb_db_user: "{{ dev_execdb_db_user }}"
execdb_db_password: "{{ dev_execdb_db_password }}" execdb_db_password: "{{ dev_execdb_db_password }}"
execdb_secret_key: "{{ dev_execdb_secret_key }}"

10
roles/taskotron/execdb/templates/settings.py.j2
View file

@ -6,13 +6,9 @@ SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://{{ prod_execdb_db_user }}:{{ pr
SECRET_KEY = '{{ stg_execdb_secret_key }}' 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 }}' SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://{{ stg_execdb_db_user }}:{{ stg_execdb_db_password }}@{{ execdb_db_host }}:{{ execdb_db_port }}/{{ execdb_db_name }}'
{% endif %} {% endif %}
{%- if deployment_type == 'dev' %} {%- if deployment_type == 'dev' or deployment_type == 'local' %}
SECRET_KEY = '{{ dev_execdb_secret_key }}' SECRET_KEY = '{{ 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 }}' SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://{{ execdb_db_user }}:{{ 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 }}'
{% endif %} {% endif %}
FILE_LOGGING = False FILE_LOGGING = False
LOGFILR = '/var/log/execdb/execdb.log' LOGFILR = '/var/log/execdb/execdb.log'