fixing variable usage
This commit is contained in:
parent
8f2f658206
commit
f443caaa0e
4 changed files with 10 additions and 6 deletions
|
@ -30,6 +30,8 @@
|
|||
- name: make the app be real
|
||||
# hosts: os_masters[0]:os_masters_stg[0]
|
||||
hosts: os_masters_stg[0]
|
||||
hosts: local
|
||||
connection: local
|
||||
user: root
|
||||
gather_facts: False
|
||||
|
||||
|
@ -104,7 +106,7 @@
|
|||
routename: api-pretty
|
||||
host: "resultsdb{{ env_suffix }}.fedoraproject.org"
|
||||
serviceport: api
|
||||
servicename: resultsdb-web
|
||||
servicename: resultsdb-api
|
||||
|
||||
- role: openshift/rollout
|
||||
app: resultsdb
|
||||
|
|
|
@ -25,8 +25,8 @@ data:
|
|||
Require valid-user
|
||||
</LimitExcept>
|
||||
</Location>
|
||||
{% if deployment_type not in ['local', 'dev'] %}
|
||||
---
|
||||
{% if deployment_type not in ['local', 'dev']%}
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
|
|
|
@ -58,6 +58,7 @@ spec:
|
|||
- name: httpd-config-volume
|
||||
mountPath: /etc/httpd/conf.d
|
||||
readOnly: true
|
||||
{% if deployment_type not in ['local', 'dev']%}
|
||||
- name: fedora-messaging-ca-volume
|
||||
mountPath: /etc/pki/rabbitmq/ca
|
||||
readOnly: true
|
||||
|
@ -70,6 +71,7 @@ spec:
|
|||
- name: fedora-messaging-config-volume
|
||||
mountPath: /etc/fedora-messaging
|
||||
readOnly: true
|
||||
{% endif %}
|
||||
readinessProbe:
|
||||
timeoutSeconds: 1
|
||||
initialDelaySeconds: 5
|
||||
|
@ -96,6 +98,7 @@ spec:
|
|||
- name: httpd-config-volume
|
||||
configMap:
|
||||
name: "resultsdb-httpd-config"
|
||||
{% if deployment_type not in ['local', 'dev']%}
|
||||
- name: fedora-messaging-config-volume
|
||||
configMap:
|
||||
name: fedora-messaging-configmap
|
||||
|
@ -108,5 +111,6 @@ spec:
|
|||
- name: fedora-messaging-key-volume
|
||||
secret:
|
||||
secretName: resultsdb-fedora-messaging-key
|
||||
{% endif %}
|
||||
triggers:
|
||||
- type: ConfigChange
|
||||
- type: ConfigChange}
|
||||
|
|
|
@ -2,5 +2,3 @@ resultsdb_publish: true
|
|||
resultsdb_mod_wsgi_dir: '${MOD_WSGI_MODULES_DIRECTORY}'
|
||||
|
||||
resultsdb_additional_result_outcomes: []
|
||||
|
||||
resultsdb_image: quay.io/fedora/resultsdb:latest
|
Loading…
Add table
Add a link
Reference in a new issue