Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

testdays: more indentation fixes

Browse source 
Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
This commit is contained in:
Pierre-Yves Chibon 2020-11-02 15:17:18 +01:00
parent 8bd054f708
commit 7b089785b2
2 changed files with 86 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

30
roles/openshift-apps/testdays/files/service.yml
View file

@ -14,18 +14,18 @@ spec:
app: testdays app: testdays
deploymentconfig: testdays deploymentconfig: testdays
--- ---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
labels: labels:
app: resultsdb app: resultsdb
name: resultsdb name: resultsdb
spec: spec:
ports: ports:
- name: 8080-tcp - name: 8080-tcp
port: 8080 port: 8080
protocol: TCP protocol: TCP
targetPort: 8080 targetPort: 8080
selector: selector:
app: resultsdb app: resultsdb
deploymentconfig: resultsdb deploymentconfig: resultsdb

143
roles/openshift-apps/testdays/templates/deploymentconfig.yml
View file

@ -74,76 +74,75 @@ spec:
kind: ImageStreamTag kind: ImageStreamTag
name: testdays:latest name: testdays:latest
--- ---
--- apiVersion: v1
apiVersion: v1 kind: DeploymentConfig
kind: DeploymentConfig metadata:
metadata: labels:
labels: app: resultsdb
app: resultsdb service: resultsdb
service: resultsdb name: resultsdb
name: resultsdb spec:
spec: replicas: 1
replicas: 1 selector:
selector: app: resultsdb
app: resultsdb deploymentconfig: resultsdb
deploymentconfig: resultsdb strategy:
strategy: type: Recreate
type: Recreate recreateParams:
recreateParams: mid:
mid: failurePolicy: Abort
failurePolicy: Abort execNewPod:
execNewPod: containerName: resultsdb
containerName: resultsdb # We only need to init the database the first time, after we just need to check
# We only need to init the database the first time, after we just need to check # for DB upgrades
# for DB upgrades command: ["python", "/opt/app-root/src/resultsdb/cli.py", "init_db"]
command: ["python", "/opt/app-root/src/resultsdb/cli.py", "init_db"] template:
template: metadata:
metadata: labels:
labels: app: resultsdb
app: resultsdb deploymentconfig: resultsdb
deploymentconfig: resultsdb spec:
spec: containers:
containers: - name: resultsdb
- name: resultsdb image: resultsdb:latest
image: resultsdb:latest ports:
ports: - containerPort: 8080
- containerPort: 8080 resources: {}
resources: {} env:
env: - name: POSTGRESQL_USER
- name: POSTGRESQL_USER value: "{{ resultsdb_testdays_db_user }}"
value: "{{ resultsdb_testdays_db_user }}" - name: POSTGRESQL_PASSWORD
- name: POSTGRESQL_PASSWORD value: "{{ resultsdb_testdays_db_pass }}"
value: "{{ resultsdb_testdays_db_pass }}" - name: POSTGRESQL_DATABASE
- name: POSTGRESQL_DATABASE value: "{{ resultsdb_testdays_db_name }}"
value: "{{ resultsdb_testdays_db_name }}" - name: POSTGRESQL_SERVICE_HOST
- name: POSTGRESQL_SERVICE_HOST value: "db01{{ env_suffix }}.iad2.fedoraproject.org"
value: "db01{{ env_suffix }}.iad2.fedoraproject.org" - name: POSTGRESQL_SERVICE_PORT
- name: POSTGRESQL_SERVICE_PORT value: "5432"
value: "5432" - name: SECRET_KEY
- name: SECRET_KEY value: "{{ resultsdb_testdays_secret_key }}"
value: "{{ resultsdb_testdays_secret_key }}" - name: OPENSHIFT_PROD
- name: OPENSHIFT_PROD value: "1"
value: "1" readinessProbe:
readinessProbe: timeoutSeconds: 1
timeoutSeconds: 1 initialDelaySeconds: 5
initialDelaySeconds: 5 httpGet:
httpGet: path: /
path: / port: 8080
port: 8080 livenessProbe:
livenessProbe: timeoutSeconds: 1
timeoutSeconds: 1 initialDelaySeconds: 30
initialDelaySeconds: 30 httpGet:
httpGet: path: /
path: / port: 8080
port: 8080
triggers: triggers:
- type: ConfigChange - type: ConfigChange
- type: ImageChange - type: ImageChange
imageChangeParams: imageChangeParams:
automatic: true automatic: true
containerNames: containerNames:
- resultsdb - resultsdb
from: from:
kind: ImageStreamTag kind: ImageStreamTag
name: resultsdb:latest name: resultsdb:latest