ELNBuildSync: Add static configuration file

Includes the Koji, Bodhi and Database configuration

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>

rh-pre-commit.version: 2.4.0
rh-pre-commit.check-secrets: ENABLED

playbooks/openshift-apps/elnbuildsync.yml

@@ -84,6 +84,11 @@
     keytab_secret_name: "{{ ebs_keytab_secret_name }}"
     keytab_username: "{{ ebs_keytab_username }}"
 
+  - role: openshift/object
+    object_app: elnbuildsync
+    object_template: public-config.yml.j2
+    object_objectname: public-config.yml
+
   - role: openshift/object
     object_app: elnbuildsync
     object_template: fedora-messaging-config.yml.j2

roles/openshift-apps/elnbuildsync/templates/deployment.yml.j2

@@ -25,6 +25,7 @@ spec:
       - name: elnbuildsync
         image: "image-registry.openshift-image-registry.svc:5000/elnbuildsync/elnbuildsync:{{ ebs_upstream_ref }}"
         args:
+        - "--static-config-file={{ ebs_static_config_file }}"
         - "--dynamic-config-url={{ ebs_config_url }}"
         - "--dynamic-config-branch={{ ebs_config_branch }}"
         - "--keytab-principal={{ ebs_krb5_principal }}"
@@ -51,6 +52,8 @@ spec:
         terminationMessagePath: /dev/termination-log
         terminationMessagePolicy: File
         volumeMounts:
+        - mountPath: "{{ ebs_static_config_path }}"
+          name: static-config
         - mountPath: "{{ ebs_keytab_path }}"
           name: keytab
         - mountPath: "{{ ebs_secrets_path }}"
@@ -63,6 +66,10 @@ spec:
       securityContext: {}
       terminationGracePeriodSeconds: 30
       volumes:
+      - name: static-config
+        secret:
+          defaultMode: 420
+          secretName: static-config
       - name: keytab
         secret:
           defaultMode: 420

roles/openshift-apps/elnbuildsync/templates/elnbuildsync_static.yml.j2

@@ -0,0 +1,18 @@
+---
+configuration:
+  koji:
+    profile: "{{ ebs_koji_profile }}"
+    build_target: "{{ ebs_build_target }}"
+    stable_tag: "{{ ebs_stable_tag }}"
+    fail_fast: true
+    username: "{{ ebs_fas_username }}"
+  bodhi:
+    batch_size: 750
+  db:
+    host: "{{ ebs_db_host }}"
+    port: 5432
+    name: "{{ ebs_db_name }}"
+    driver: postgresql+asyncpg
+    user: "{{ ebs_db_user }}"
+  open_id_connect: false
+  email: false

roles/openshift-apps/elnbuildsync/templates/public-config.yml.j2

@@ -0,0 +1,8 @@
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: public-config
+data:
+  elnbuildsync.yml: |
+    {{ lookup('template', 'elnbuildsync_static.yml.j2') | indent }}

roles/openshift-apps/elnbuildsync/vars/main.yml

@@ -7,6 +7,9 @@ description: >-
 ebs_fas_username: eln-buildsync
 ebs_krb5_principal: "{{ ebs_fas_username }}@{{ ipa_realm }}"
 
+ebs_static_config_path: /etc/elnbuildsync/static-config/
+ebs_static_config_file: "{{ ebs_static_config_path }}/elnbuildsync.yml"
+
 ebs_keytab_app: elnbuildsync
 ebs_keytab_username: eln-buildsync
 ebs_keytab_key: elnbuildsync.keytab
@@ -18,3 +21,8 @@ ebs_keytab_file: "{{ ebs_keytab_path }}/{{ ebs_keytab_key }}"
 ebs_secrets_path: /etc/elnbuildsync/secrets
 
 ebs_fedora_messaging_path: /etc/fedora-messaging
+
+ebs_build_target: eln
+ebs_stable_tag: eln
+
+ebs_db_host: db01{{env_suffix}}.{{datacenter}}.fedoraproject.org

roles/openshift-apps/elnbuildsync/vars/staging.yml

@@ -1,7 +1,7 @@
 ---
 
 ebs_upstream_repo: https://github.com/fedora-eln/elnbuildsync.git
-ebs_upstream_ref: 1.1.2
+ebs_upstream_ref: 1.2.0
 
 ebs_config_url: https://github.com/fedora-eln/elnbuildsync-config.git
 ebs_config_branch: staging