From 618614e635e5da8b0ac75debebbfbe2c66991f62 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Thu, 26 Dec 2024 21:35:44 +0100 Subject: [PATCH] Ensure repo_server proper username With migration to Apache role we need now to use correct username for Apache, which depends on the distro heavily. Upgrade jobs are set to NV in order to solve circular dependency with repo_server adopting HTTPD role. Needed-By: https://review.opendev.org/c/openstack/openstack-ansible-repo_server/+/938270 Change-Id: I6de2987a5f8c6f0bb5960c52e145c1ef114116a8 --- inventory/group_vars/all/all.yml | 7 +++++-- zuul.d/project.yaml | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/inventory/group_vars/all/all.yml b/inventory/group_vars/all/all.yml index 7e99320ede..9c90d4bfcb 100644 --- a/inventory/group_vars/all/all.yml +++ b/inventory/group_vars/all/all.yml @@ -140,8 +140,11 @@ deployment_extra_facts_subset: hardware deployment_extra_facts_filter: ansible_processor_* # Set permissions for repo server and files built on it -repo_service_user_name: www-data -repo_service_group_name: www-data +_repo_service_user_mapping: + debian: www-data + redhat: apache +repo_service_user_name: "{{ _repo_service_user_mapping[ansible_facts['os_family'] | lower] }}" +repo_service_group_name: "{{ _repo_service_user_mapping[ansible_facts['os_family'] | lower] }}" venv_build_host_user_name: "{{ repo_service_user_name }}" venv_build_host_group_name: "{{ repo_service_group_name }}" diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 9c401b189d..862788a470 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -28,3 +28,17 @@ - check-requirements - publish-openstack-docs-pti - release-notes-jobs-python3 + check: + jobs: + - openstack-ansible-upgrade-aio_metal-rockylinux-9: + voting: false + - openstack-ansible-upgrade_2024.1-aio_metal-rockylinux-9: + voting: false + - openstack-ansible-upgrade-aio_metal-ubuntu-jammy: + voting: false + - openstack-ansible-upgrade_2024.1-aio_metal-ubuntu-jammy: + voting: false + - openstack-ansible-upgrade-aio_metal_tls-rockylinux-9: + voting: false + - openstack-ansible-upgrade-aio_metal_tls-ubuntu-jammy: + voting: false \ No newline at end of file