From 3f5cb87166e63f1d1e880880cd2b4748782cb971 Mon Sep 17 00:00:00 2001 From: Silvie Chlupova Date: Mon, 6 Sep 2021 22:31:56 +0200 Subject: [PATCH] copr-fe: support for principal alias Relates: https://pagure.io/fedora-infrastructure/issue/10065 --- inventory/host_vars/copr-fe-dev.aws.fedoraproject.org | 1 + roles/copr/frontend-cloud/tasks/httpd.yml | 1 + roles/ipa/service/tasks/main.yml | 3 +++ 3 files changed, 5 insertions(+) diff --git a/inventory/host_vars/copr-fe-dev.aws.fedoraproject.org b/inventory/host_vars/copr-fe-dev.aws.fedoraproject.org index 8486a3d834..93b44de018 100644 --- a/inventory/host_vars/copr-fe-dev.aws.fedoraproject.org +++ b/inventory/host_vars/copr-fe-dev.aws.fedoraproject.org @@ -2,6 +2,7 @@ datacenter: aws inventory_hostname: "copr-fe-dev.aws.fedoraproject.org" inventory_instance_name: copr-fe-dev +principal_alias: "HTTP/copr-fe-dev.cloud.fedoraproject.org@STG.FEDORAPROJECT.ORG" nm_controlled_resolv: True ansible_ifcfg_blocklist: True diff --git a/roles/copr/frontend-cloud/tasks/httpd.yml b/roles/copr/frontend-cloud/tasks/httpd.yml index e97434d0b3..9be137f806 100644 --- a/roles/copr/frontend-cloud/tasks/httpd.yml +++ b/roles/copr/frontend-cloud/tasks/httpd.yml @@ -99,3 +99,4 @@ kt_location: /etc/httpd/conf.d/copr-frontend-http-api.keytab owner_group: apache owner_user: apache + principal_alias: "{{ principal_alias }}" diff --git a/roles/ipa/service/tasks/main.yml b/roles/ipa/service/tasks/main.yml index d159e53770..997b0f3fe9 100644 --- a/roles/ipa/service/tasks/main.yml +++ b/roles/ipa/service/tasks/main.yml @@ -14,6 +14,9 @@ ipaservice: ipaadmin_password: "{{ ipa_admin_password }}" name: "{{ service }}/{{ host }}" +{% if principal_alias is defined %} + principal: "{{ principal_alias }}" +{% endif %} force: yes tags: - config