infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

removing blockerbugs-stg reliance on hosts file for db host

Browse source
This commit is contained in:
Tim Flink 2017-08-14 17:09:39 +00:00
parent 0e2222680a
commit 03d02cb39e
2 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
inventory/group_vars/blockerbugs-stg
View file

@ -16,3 +16,17 @@ sudoers: "{{ private }}/files/sudo/qadevel-sudoers"
# This gets overridden by whichever node we want to run special cronjobs.
master_blockerbugs_node: False
blockerbugs_secret_key: "{{ stg_blockerbugs_secret_key }}"
############################################################
# blockerbugs db details
############################################################
blockerbugs_db_host_machine: db01.stg.phx2.fedoraproject.org
blockerbugs_db_host: "{{ blockerbugs_db_host_machine }}"
blockerbugs_db_port: 5432
blockerbugs_db_name: blockerbugs
blockerbugs_db_user: "{{ stg_blockerbugs_db_user }}"
blockerbugs_db_password: "{{ stg_blockerbugs_db_password }}"

4
roles/blockerbugs/templates/blockerbugs-settings.py.j2
View file

@ -1,5 +1,9 @@
SECRET_KEY = '{{ blockerbugs_secret_key }}'
{% if env == "staging" %}
SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://{{ blockerbugs_db_user }}:{{ blockerbugs_db_password }}@{{ blockerbugs_db_host }}:{{ blockerbugs_db_port }}/{{ blockerbugs_db_name }}'
{% else %}
SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://{{ blockerbugs_app }}:{{ blockerbugs_appPassword }}@db-blockerbugs/blockerbugs'
{% endif %}
FAS_ADMIN_GROUP = "qa-admin"
FAS_USER = "{{ blockerbugs_fas_user }}@fedoraproject.org"
FAS_PASSWORD = "{{ blockerbugs_fas_password }}"