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

Noggin: small fixups

Browse source 
Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
This commit is contained in:
Aurélien Bompard 2020-08-20 13:23:32 +02:00
parent 630e1fd8ca
commit 45a8658c04
No known key found for this signature in database
GPG key ID: 31584CFEB9BF64AD
4 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
playbooks/openshift-apps/noggin.yml
View file

@ -17,7 +17,7 @@
- role: openshift/project - role: openshift/project
app: noggin app: noggin
description: noggin description: "Self-service account portal"
appowners: appowners:
- abompard - abompard
- pingou - pingou
@ -26,7 +26,7 @@
when: env == "production" when: env == "production"
- role: openshift/project - role: openshift/project
app: noggin app: noggin
description: noggin description: "Self-service account portal"
appowners: appowners:
- abompard - abompard
- pingou - pingou

6
roles/openshift-apps/noggin/files/imagestream.yml
View file

@ -1,6 +0,0 @@
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
name: noggin
labels:
app: noggin

1
roles/openshift-apps/noggin/templates/buildconfig.yml
View file

@ -35,7 +35,6 @@ spec:
github: github:
secret: "{{ noggin_stg_github_secret }}" secret: "{{ noggin_stg_github_secret }}"
{% elif noggin_github_secret is defined and env == 'production' %} {% elif noggin_github_secret is defined and env == 'production' %}
- type: GitHub
github: github:
secret: "{{ noggin_github_secret }}" secret: "{{ noggin_github_secret }}"
{% endif %} {% endif %}

2
roles/openshift/ipa-client/templates/ldap.conf
View file

@ -1,4 +1,4 @@
SASL_NOCANON on SASL_NOCANON on
URI ldaps://{{ ipa_server }} URI ldaps://{{ ipa_server }}
BASE {% if env == "staging" %}dc=stg,{% endif %}dc=fedoraproject,dc=org BASE {% if env == "staging" %}dc=stg,{% endif %}dc=fedoraproject,dc=org
TLS_CACERT /etc/ipa/ca.crt TLS_CACERT /etc/ipa/ca.crt