diff options
author | Ricky Elrod <codeblock@fedoraproject.org> | 2017-08-23 19:45:26 +0000 |
---|---|---|
committer | Ricky Elrod <codeblock@fedoraproject.org> | 2017-08-23 19:45:26 +0000 |
commit | 6f6a2dbfe95bdc49190ebe2d7378a4eaba805fba (patch) | |
tree | 0b242fab9c4b3bc59bee7b5efbaac387b4737a5a | |
parent | 5f6624fe827f74943486f90c90d683256d3a40ba (diff) | |
download | ansible-6f6a2dbfe95bdc49190ebe2d7378a4eaba805fba.tar.gz ansible-6f6a2dbfe95bdc49190ebe2d7378a4eaba805fba.tar.xz ansible-6f6a2dbfe95bdc49190ebe2d7378a4eaba805fba.zip |
Move waiverdb configmap to a template to conditionalize stg vs not
Signed-off-by: Ricky Elrod <codeblock@fedoraproject.org>
-rw-r--r-- | playbooks/openshift-apps/waiverdb.yml | 2 | ||||
-rw-r--r-- | roles/openshift-apps/waiverdb/templates/configmap.yml (renamed from roles/openshift-apps/waiverdb/files/configmap.yml) | 4 |
2 files changed, 5 insertions, 1 deletions
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/templates/configmap.yml index 0248cb7a5..d9c651d32 100644 --- a/roles/openshift-apps/waiverdb/files/configmap.yml +++ b/roles/openshift-apps/waiverdb/templates/configmap.yml @@ -6,7 +6,11 @@ metadata: 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 |