Merge "Update repo verification file URI"

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 }}"

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"

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: