From c92a81e3fe21ba50d35b420f1f175752db2444ee Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Thu, 24 Aug 2017 12:53:07 +0000 Subject: [PATCH] Remove -stg from waiverdb Signed-off-by: Patrick Uiterwijk --- playbooks/openshift-apps/waiverdb.yml | 3 +-- roles/openshift-apps/waiverdb/templates/configmap.yml | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/playbooks/openshift-apps/waiverdb.yml b/playbooks/openshift-apps/waiverdb.yml index 376504cc41..6ba49dcd02 100644 --- a/playbooks/openshift-apps/waiverdb.yml +++ b/playbooks/openshift-apps/waiverdb.yml @@ -22,5 +22,4 @@ - { role: openshift/object, app: waiverdb, file: service.yml } - { role: openshift/object, app: waiverdb, file: route.yml } - { role: openshift/object, app: waiverdb, file: deploymentconfig.yml } - - { role: openshift/rollout, app: waiverdb, name: waiverdb-stg-web, when: env == "staging" } - - { role: openshift/rollout, app: waiverdb, name: waiverdb-web, when: env != "staging" } + - { role: openshift/rollout, app: waiverdb, name: waiverdb-web } diff --git a/roles/openshift-apps/waiverdb/templates/configmap.yml b/roles/openshift-apps/waiverdb/templates/configmap.yml index 046a2c6ea2..cfedc23c92 100644 --- a/roles/openshift-apps/waiverdb/templates/configmap.yml +++ b/roles/openshift-apps/waiverdb/templates/configmap.yml @@ -1,11 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: -{% if env == 'staging' %} - name: waiverdb-stg-configmap -{% else %} name: waiverdb-configmap -{% endif %} labels: app: waiverdb data: