From f67370f568abd72564e8f3de8982703e6bfac63b Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Thu, 19 May 2022 18:32:39 +0200 Subject: [PATCH] Update repo verification file URI Since we're creating a symlink to the U-C file to have a consistent filename for it, it makes sense to verify this file for simplicity. With migration to gluster we also should change verification URI for HaProxy, which we also set to u-c link. With that we also somehow solve issue when u-c can't be fetched when SHA is updated, but repo-server role wasn't re-ran. Closes-Bug: #1943978 Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-repo_server/+/842567 Change-Id: I23ac2ec3246cbae50d30815fbd3bdcc4da7d7089 --- inventory/group_vars/haproxy/haproxy.yml | 2 +- playbooks/defaults/source_install.yml | 2 +- playbooks/healthcheck-infrastructure.yml | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/inventory/group_vars/haproxy/haproxy.yml b/inventory/group_vars/haproxy/haproxy.yml index 2c043eb8fb..e612030f21 100644 --- a/inventory/group_vars/haproxy/haproxy.yml +++ b/inventory/group_vars/haproxy/haproxy.yml @@ -451,7 +451,7 @@ haproxy_repo_service: haproxy_port: 8181 haproxy_balance_type: http haproxy_backend_options: - - "httpchk GET /repo_sync_complete HTTP/1.0\\r\\nUser-agent:\\ osa-haproxy-healthcheck" + - "httpchk GET /constraints/upper_constraints_cached.txt HTTP/1.0\\r\\nUser-agent:\\ osa-haproxy-healthcheck" haproxy_backend_httpcheck_options: - "expect status 200" haproxy_service_enabled: "{{ groups['repo_all'] is defined and groups['repo_all'] | length > 0 }}" diff --git a/playbooks/defaults/source_install.yml b/playbooks/defaults/source_install.yml index 66a7f924c2..7e5336baab 100644 --- a/playbooks/defaults/source_install.yml +++ b/playbooks/defaults/source_install.yml @@ -36,4 +36,4 @@ openstack_db_setup_host: "{{ openstack_service_setup_host }}" openstack_db_setup_python_interpreter: "{{ openstack_service_setup_host_python_interpreter }}" # Locally cached copy on the repo server for the OpenStack upper-constraints.txt -requirements_git_url: "{{ openstack_repo_url ~ '/constraints/upper_constraints_' ~ requirements_git_install_branch ~ '.txt' }}" +requirements_git_url: "{{ openstack_repo_url }}/constraints/upper_constraints_cached.txt" diff --git a/playbooks/healthcheck-infrastructure.yml b/playbooks/healthcheck-infrastructure.yml index 274845b10a..7684410475 100644 --- a/playbooks/healthcheck-infrastructure.yml +++ b/playbooks/healthcheck-infrastructure.yml @@ -23,10 +23,8 @@ - name: Ensure all repo-servers are built and are accessible by hosts. hosts: all_containers[0]:physical_hosts[0] gather_facts: yes - vars_files: - - "defaults/repo_packages/openstack_services.yml" vars: - repo_requirements_file: "{{ 'constraints/upper_constraints_' ~ requirements_git_install_branch ~ '.txt' }}" + repo_requirements_file: "constraints/upper_constraints_cached.txt" tasks: - name: Check the repo sync file on each repo server uri: