ELNBuildSync: reorganize ansible variables

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

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

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

@@ -24,7 +24,12 @@ spec:
       containers:
       - name: elnbuildsync
         image: "image-registry.openshift-image-registry.svc:5000/elnbuildsync/elnbuildsync:{{ ebs_upstream_ref }}"
-        args: ['--config-url', "{{ ebs_config_url }}", '--config-branch', "{{ ebs_config_branch }}", '--keytab-principal', "{{ ebs_krb5_principal }}", '--koji-profile', "{{ ebs_koji_profile }}"]
+        args:
+        - "--dynamic-config-url={{ ebs_config_url }}"
+        - "--dynamic-config-branch={{ ebs_config_branch }}"
+        - "--keytab-principal={{ ebs_krb5_principal }}"
+        - "--keytab-path={{ ebs_keytab_file }}"
+        - "--koji-profile={{ ebs_koji_profile }}"
         startupProbe:
           httpGet:
             path: /startup
@@ -46,11 +51,11 @@ spec:
         terminationMessagePath: /dev/termination-log
         terminationMessagePolicy: File
         volumeMounts:
-        - mountPath: /keytab
+        - mountPath: "{{ ebs_keytab_path }}"
           name: keytab
-        - mountPath: /etc/elnbuildsync
+        - mountPath: "{{ ebs_secrets_path }}"
           name: ebs-config
-        - mountPath: /etc/fedora-messaging
+        - mountPath: "{{ ebs_fedora_messaging_path }}"
           name: fedora-messaging-config
       dnsPolicy: ClusterFirst
       restartPolicy: Always

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

@@ -1,9 +1,20 @@
 ---
 app: elnbuildsync
-description: ELNBuildSync is a tool that listens for Fedora Rawhide builds and re-builds them in the Fedora ELN build environment.
+description: >-
+  ELNBuildSync is a tool that listens for Fedora Rawhide builds and re-builds
+  them in the Fedora ELN build environment.
+
+ebs_fas_username: eln-buildsync
+ebs_krb5_principal: "{{ ebs_fas_username }}@{{ ipa_realm }}"
 
 ebs_keytab_app: elnbuildsync
 ebs_keytab_username: eln-buildsync
-ebs_keytab_key: distrobaker.keytab
+ebs_keytab_key: elnbuildsync.keytab
 ebs_keytab_secret_name: keytab
-ebs_keytab_path: /{{ ebs_keytab_secret_name }}/{{ ebs_keytab_key }}.keytab
+
+ebs_keytab_path: "/etc/elnbuildsync/{{ ebs_keytab_secret_name }}"
+ebs_keytab_file: "{{ ebs_keytab_path }}/{{ ebs_keytab_key }}"
+
+ebs_secrets_path: /etc/elnbuildsync/secrets
+
+ebs_fedora_messaging_path: /etc/fedora-messaging

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

@@ -9,6 +9,4 @@ ebs_config_branch: main
 ebs_db_user: elnbuildsync
 ebs_db_name: elnbuildsync
 
-ebs_krb5_principal: eln-buildsync@FEDORAPROJECT.ORG
-
 ebs_koji_profile: koji

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

@@ -9,6 +9,4 @@ ebs_config_branch: staging
 ebs_db_user: elnbuildsync
 ebs_db_name: elnbuildsync
 
-ebs_krb5_principal: eln-buildsync@STG.FEDORAPROJECT.ORG
-
 ebs_koji_profile: stg