Prepare FASJSON for the new certificate profile setting

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>

roles/openshift-apps/fasjson/templates/configmap.yml

@@ -15,6 +15,8 @@ items:
       {{ load_file('start.sh') | indent(6) }}
     httpd.conf: |-
       {{ load_file('httpd.conf') | indent(6) }}
+    fasjson.conf: |-
+      {{ load_file('fasjson.conf') | indent(6) }}
 - apiVersion: v1
   kind: ConfigMap
   metadata:

roles/openshift-apps/fasjson/templates/deploymentconfig.yml

@@ -26,62 +26,65 @@ spec:
         deploymentconfig: fasjson
     spec:
       containers:
-      - name: fasjson
+        - name: fasjson
-        imagePullPolicy: Always
+          imagePullPolicy: Always
-        ports:
+          ports:
-        - containerPort: 8080
+            - containerPort: 8080
-        volumeMounts:
+          volumeMounts:
-        - name: keytab-http-volume
+            - name: keytab-http-volume
-          mountPath: /etc/keytabs/http
+              mountPath: /etc/keytabs/http
-          subPath: http
+              subPath: http
-          readOnly: true
+              readOnly: true
-        - name: krb-config-volume
+            - name: krb-config-volume
-          mountPath: /etc/krb5
+              mountPath: /etc/krb5
-          readOnly: true
+              readOnly: true
-        - name: fasjson-config-volume
+            - name: fasjson-config-volume
-          mountPath: /etc/fasjson
+              mountPath: /etc/fasjson
-          readOnly: true
+              readOnly: true
-        - name: ipa-config-volume
+            - name: ipa-config-volume
-          mountPath: /etc/ipa
+              mountPath: /etc/ipa
-          readOnly: true
+              readOnly: true
-        - name: httpdir
+            - name: httpdir
-          mountPath: /httpdir
+              mountPath: /httpdir
-        livenessProbe:
+          env:
-          timeoutSeconds: 10
+            - name: FASJSON_CONFIG_PATH
-          initialDelaySeconds: 10
+              value: "/etc/fasjson/fasjson.conf"
-          periodSeconds: 60
+          livenessProbe:
-          httpGet:
+            timeoutSeconds: 10
-            path: /healthz/live
+            initialDelaySeconds: 10
-            port: 8080
+            periodSeconds: 60
-        readinessProbe:
+            httpGet:
-          timeoutSeconds: 10
+              path: /healthz/live
-          initialDelaySeconds: 5
+              port: 8080
-          periodSeconds: 60
+          readinessProbe:
-          httpGet:
+            timeoutSeconds: 10
-            path: /healthz/ready
+            initialDelaySeconds: 5
-            port: 8080
+            periodSeconds: 60
+            httpGet:
+              path: /healthz/ready
+              port: 8080
       volumes:
-      - name: fasjson-config-volume
+        - name: fasjson-config-volume
-        configMap:
+          configMap:
-          name: fasjson-config
+            name: fasjson-config
-      - name: keytab-http-volume
+        - name: keytab-http-volume
-        secret:
+          secret:
-          secretName: fasjson-keytab-http
+            secretName: fasjson-keytab-http
-      - name: krb-config-volume
+        - name: krb-config-volume
-        configMap:
+          configMap:
-          name: krb5-config
+            name: krb5-config
-      - name: ipa-config-volume
+        - name: ipa-config-volume
-        configMap:
+          configMap:
-          name: ipa-client-config
+            name: ipa-client-config
-      - name: httpdir
+        - name: httpdir
-        emptyDir: {}
+          emptyDir: {}
   triggers:
-  - imageChangeParams:
+    - imageChangeParams:
-      automatic: true
+        automatic: true
-      containerNames:
+        containerNames:
-      - fasjson
+          - fasjson
-      from:
+        from:
-        kind: ImageStreamTag
+          kind: ImageStreamTag
-        name: fasjson:latest
+          name: fasjson:latest
-    type: ImageChange
+      type: ImageChange
-  - type: ConfigChange
+    - type: ConfigChange

roles/openshift-apps/fasjson/templates/fasjson.conf

@@ -0,0 +1,2 @@
+# The ID of the Certificate Profile to use in IPA
+CERTIFICATE_PROFILE = "userCerts"