From fde5e94e6868eb2cb894a69a6c8b6e34302ccd19 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 28 Sep 2022 16:27:38 -0700 Subject: [PATCH] notifs / backend / staging: override the fedmsg-hub-3 service for fasjson We need to tell fasjson what keytab to use, so we should override the service file here and pass it as a env variable. Signed-off-by: Kevin Fenzi --- roles/notifs/backend/tasks/main.yml | 18 ++++++++++++++++++ .../notifs/backend/templates/override.conf.j2 | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 roles/notifs/backend/templates/override.conf.j2 diff --git a/roles/notifs/backend/tasks/main.yml b/roles/notifs/backend/tasks/main.yml index 71218d0f88..6d14fb0c60 100644 --- a/roles/notifs/backend/tasks/main.yml +++ b/roles/notifs/backend/tasks/main.yml @@ -33,6 +33,24 @@ - notifs - notifs/backend +- name: ensure systemd drop-in directory exists + file: > + dest=/etc/systemd/system/fedmsg-hub-3.service.d + state=directory + tags: + - notifs + - notifs/backend + when: + inventory_hostname.startswith('notifs-backend02') or env == 'staging' + +- name: install fedmsg-hub-3 systemd drop-in + template: src=override.conf dest=/etc/systemd/system/fedmsg-hub-3.service.d/override.conf owner=root group=root mode=644 + tags: + - notifs + - notifs/backend + when: + inventory_hostname.startswith('notifs-backend02') or env == 'staging' + - name: copy database configuration template: > src={{ item }} dest=/etc/fedmsg.d/{{ item }} diff --git a/roles/notifs/backend/templates/override.conf.j2 b/roles/notifs/backend/templates/override.conf.j2 new file mode 100644 index 0000000000..c984abe858 --- /dev/null +++ b/roles/notifs/backend/templates/override.conf.j2 @@ -0,0 +1,2 @@ +[service] +Environment=KRB5_CLIENT_KTNAME=/etc/krb5.fedmsg-hub-3_notifs-backend01.{{ env_prefix }}iad2.fedoraproject.org.keytab