From f282de1c042bf7b3e341e34a930ce7083ff4ee4b Mon Sep 17 00:00:00 2001
From: Tim Flink <tflink@fedoraproject.org>
Date: Mon, 5 Oct 2015 15:40:47 +0000
Subject: [PATCH] adding missing vars to resultsdb-dev, refactoring execdb
 settings

---
 inventory/group_vars/resultsdb-dev              |  4 ++--
 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 d03a32defc..fc37194da7 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 6075840ca9..9494fe200f 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'