ELNBuildSync: Further fixes for prod/stg var split

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

@@ -7,14 +7,15 @@
   vars_files:
     - /srv/web/infra/ansible/vars/global.yml
     - /srv/private/ansible/vars.yml
-    - /srv/web/infra/ansible/vars/apps/elnbuildsync.yml
     - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
+    - /srv/web/infra/ansible/roles/openshift-apps/elnbuildsync/vars/main.yml
+    - /srv/web/infra/ansible/roles/openshift-apps/elnbuildsync/vars/{{ env }}.yml
 
   tasks:
     - name: ELNBuildSync DB user
       community.postgresql.postgresql_user:
         name: "{{ ebs_db_user }}"
-        password: "{{ (env == 'production') | ternary(ebs_db_password, ebs_stg_db_password) }}"
+        password: "{{ ebs_db_password }}"
 
     - name: ELNBuildSync database creation
       community.postgresql.postgresql_db:

vars/apps/elnbuildsync.yml

@@ -1,15 +0,0 @@
----
-ebs_upstream_repo: https://github.com/fedora-eln/elnbuildsync.git
-ebs_upstream_ref: 1.1.0
-
-ebs_db_user: elnbuildsync
-ebs_db_name: elnbuildsync
-
-ebs_config_branch: main
-ebs_stg_config_branch: staging
-
-ebs_keytab_app: elnbuildsync
-ebs_keytab_username: eln-buildsync
-ebs_keytab_key: distrobaker
-ebs_keytab_secret_name: keytab
-ebs_keytab_path: /{{ ebs_keytab_secret_name }}/{{ ebs_keytab_key }}.keytab