diff options
| author | Tim Flink <tflink@fedoraproject.org> | 2017-08-14 17:09:39 +0000 |
|---|---|---|
| committer | Tim Flink <tflink@fedoraproject.org> | 2017-08-14 17:09:54 +0000 |
| commit | 03d02cb39e74164f0b6f6071f18b34af05523a87 (patch) | |
| tree | ea737dfae2281945a1418dc1bfee61d9c5817246 | |
| parent | 0e2222680a26aae6ab9934a679cf21dad63be06d (diff) | |
| download | ansible-03d02cb39e74164f0b6f6071f18b34af05523a87.tar.gz ansible-03d02cb39e74164f0b6f6071f18b34af05523a87.tar.xz ansible-03d02cb39e74164f0b6f6071f18b34af05523a87.zip | |
removing blockerbugs-stg reliance on hosts file for db host
| -rw-r--r-- | inventory/group_vars/blockerbugs-stg | 14 | ||||
| -rw-r--r-- | roles/blockerbugs/templates/blockerbugs-settings.py.j2 | 4 |
2 files changed, 18 insertions, 0 deletions
diff --git a/inventory/group_vars/blockerbugs-stg b/inventory/group_vars/blockerbugs-stg index 208b9bfc2..ed2e8ae99 100644 --- a/inventory/group_vars/blockerbugs-stg +++ b/inventory/group_vars/blockerbugs-stg @@ -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 }}" + diff --git a/roles/blockerbugs/templates/blockerbugs-settings.py.j2 b/roles/blockerbugs/templates/blockerbugs-settings.py.j2 index bc12d10ed..4b692659b 100644 --- a/roles/blockerbugs/templates/blockerbugs-settings.py.j2 +++ b/roles/blockerbugs/templates/blockerbugs-settings.py.j2 @@ -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 }}" |