From 2adc74f3d5fedf7e85c20847ca18260a8555482b Mon Sep 17 00:00:00 2001
From: Matt Jia <mjia@redhat.com>
Date: Wed, 17 May 2017 13:09:23 +1000
Subject: [PATCH] waiverdb role: fix the settings.py template

---
 inventory/host_vars/waiverdb-dev.fedorainfracloud.org | 1 +
 roles/waiverdb/templates/etc/waiverdb/settings.py.j2  | 8 +++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/inventory/host_vars/waiverdb-dev.fedorainfracloud.org b/inventory/host_vars/waiverdb-dev.fedorainfracloud.org
index 52a72a9328..aad3add4fc 100644
--- a/inventory/host_vars/waiverdb-dev.fedorainfracloud.org
+++ b/inventory/host_vars/waiverdb-dev.fedorainfracloud.org
@@ -12,6 +12,7 @@ hostbase: waverdb-dev
 public_ip: 209.132.184.51
 root_auth_users: mjia
 description: waverdb development instance
+deployment_type: dev
 
 cloud_networks:
   # persistent-net
diff --git a/roles/waiverdb/templates/etc/waiverdb/settings.py.j2 b/roles/waiverdb/templates/etc/waiverdb/settings.py.j2
index df7d8084b9..986a7f9520 100644
--- a/roles/waiverdb/templates/etc/waiverdb/settings.py.j2
+++ b/roles/waiverdb/templates/etc/waiverdb/settings.py.j2
@@ -1,6 +1,6 @@
-{% if env == "production" %}
+{% if deployment_type == "prod" %}
 SECRET_KEY = '{{ prod_waiverdb_secret_key }}'
-{% elif env == "staging" %}
+{% elif deployment_type == "stg" %}
 SECRET_KEY = '{{ stg_waiverdb_secret_key }}'
 {% else %}
 SECRET_KEY = '{{ dev_waiverdb_secret_key }}'
@@ -9,8 +9,6 @@ SQLALCHEMY_DATABASE_URI = 'postgresql://waiverdb-user@:{{ waiverdb_db_port }}/wa
 OIDC_CLIENT_SECRETS = '/etc/waiverdb/client_secrets.json'
 OIDC_REQUIRED_SCOPE = 'https://waiverdb.fedoraproject.org/oidc/create-waiver'
 OIDC_RESOURCE_SERVER_ONLY = True
-{% if env == "production" or env == "staging" %}
-ZEROMQ_PUBLISH = True
-{% else %}
+{% if deployment_type == "dev" %}
 ZEROMQ_PUBLISH = False
 {% endif %}