From 6f6a2dbfe95bdc49190ebe2d7378a4eaba805fba Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Wed, 23 Aug 2017 19:45:26 +0000 Subject: Move waiverdb configmap to a template to conditionalize stg vs not Signed-off-by: Ricky Elrod --- playbooks/openshift-apps/waiverdb.yml | 2 +- roles/openshift-apps/waiverdb/files/configmap.yml | 12 ------------ roles/openshift-apps/waiverdb/templates/configmap.yml | 16 ++++++++++++++++ 3 files changed, 17 insertions(+), 13 deletions(-) delete mode 100644 roles/openshift-apps/waiverdb/files/configmap.yml create mode 100644 roles/openshift-apps/waiverdb/templates/configmap.yml diff --git a/playbooks/openshift-apps/waiverdb.yml b/playbooks/openshift-apps/waiverdb.yml index 3f2da490c..628b2b5f7 100644 --- a/playbooks/openshift-apps/waiverdb.yml +++ b/playbooks/openshift-apps/waiverdb.yml @@ -18,7 +18,7 @@ # , template: client_secrets.json # } - { role: openshift/object, app: waiverdb, file: imagestream.yml } - - { role: openshift/object, app: waiverdb, file: configmap.yml } + - { role: openshift/object, app: waiverdb, template: configmap.yml } - { role: openshift/object, app: waiverdb, file: service.yml } - { role: openshift/object, app: waiverdb, file: route.yml } - { role: openshift/object, app: waiverdb, file: deploymentconfig.yml } diff --git a/roles/openshift-apps/waiverdb/files/configmap.yml b/roles/openshift-apps/waiverdb/files/configmap.yml deleted file mode 100644 index 0248cb7a5..000000000 --- a/roles/openshift-apps/waiverdb/files/configmap.yml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: waiverdb-stg-configmap - labels: - app: waiverdb -data: - settings.py: |- - DATABASE_URI = 'postgresql+psycopg2://waiverdb@db01.stg.phx2.fedoraproject.org:5432/waiverdb' - AUTH_METHOD = 'OIDC' - OIDC_CLIENT_SECRETS = '/etc/secret/client_secrets.json' - PORT = 8080 diff --git a/roles/openshift-apps/waiverdb/templates/configmap.yml b/roles/openshift-apps/waiverdb/templates/configmap.yml new file mode 100644 index 000000000..d9c651d32 --- /dev/null +++ b/roles/openshift-apps/waiverdb/templates/configmap.yml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: waiverdb-stg-configmap + labels: + app: waiverdb +data: + settings.py: |- +{% if env == 'staging' %} + DATABASE_URI = 'postgresql+psycopg2://waiverdb@db01.stg.phx2.fedoraproject.org:5432/waiverdb' +{% else %} + DATABASE_URI = 'postgresql+psycopg2://waiverdb@db01.phx2.fedoraproject.org:5432/waiverdb' +{% end %} + AUTH_METHOD = 'OIDC' + OIDC_CLIENT_SECRETS = '/etc/secret/client_secrets.json' + PORT = 8080 -- cgit