Backported fixes for healthcheck playbooks

Backports on the infrastructure healthcheck are from change
I08e4cced3619212236ccc303ee8665c237244359

Backports on the openstack healthcheck are from change
I73cd3ef5a8c63be66f1a68e9e2de34421e27e6fd

Change-Id: Ibb59515cc4fb2110c50e97be4b8c40a583fcb9d0
This commit is contained in:
Marcus Klein 2021-08-09 15:43:47 +02:00 committed by Dmitriy Rabotyagov
parent 766e477968
commit 84af4f7e61
3 changed files with 9 additions and 8 deletions

View File

@ -1,4 +1,4 @@
collections: collections:
- name: openstack.cloud - name: openstack.cloud
version: 1.0.0 version: 1.0.1
source: https://galaxy.ansible.com source: https://galaxy.ansible.com

View File

@ -24,7 +24,7 @@
hosts: all_containers[0]:physical_hosts[0] hosts: all_containers[0]:physical_hosts[0]
gather_facts: yes gather_facts: yes
vars: vars:
repo_requirements_file: "os-releases/{{ openstack_release }}/{{ os_distro_version }}/requirements_constraints.txt" repo_requirements_file: "os-releases/{{ openstack_release }}/{{ os_distro_version }}/"
tasks: tasks:
- name: Check the upper constraint on each repo server - name: Check the upper constraint on each repo server
uri: uri:
@ -85,7 +85,7 @@
# Repo release path points to the internal LB vip # Repo release path points to the internal LB vip
- name: Check the presence of upper constraints on your repos and check load balancing - name: Check the presence of upper constraints on your repos and check load balancing
uri: uri:
url: "{{ repo_release_path }}/requirements_constraints.txt" url: "{{ repo_release_path }}/"
tags: tags:
- healthcheck - healthcheck
- healthcheck-repo-use - healthcheck-repo-use
@ -194,7 +194,7 @@
dest: "{{ venv_path }}/rabbitmq-test.py" dest: "{{ venv_path }}/rabbitmq-test.py"
mode: 0755 mode: 0755
- name: Connect to rabbitmq - name: Connect to rabbitmq
command: "{{ venv_path }}/bin/python2 {{ venv_path }}/rabbitmq-test.py {{ hostvars[groups['rabbitmq_all'][0]]['container_address'] }}" command: "{{ venv_path }}/bin/python {{ venv_path }}/rabbitmq-test.py {{ hostvars[groups['rabbitmq_all'][0]]['container_address'] }}"
tags: tags:
- healthcheck - healthcheck
- healthcheck-rabbitmq-install - healthcheck-rabbitmq-install

View File

@ -149,7 +149,7 @@
- "not 'is in use' in item.msg" - "not 'is in use' in item.msg"
- name: Store facts to see if everything is ok - name: Store facts to see if everything is ok
openstack.cloud.os_networks_facts: openstack.cloud.networks_info:
cloud: default cloud: default
interface: internal interface: internal
verify: no verify: no
@ -313,19 +313,20 @@
volume: "{{ cinder_volumes[0]['name'] }}" volume: "{{ cinder_volumes[0]['name'] }}"
- name: Get server facts - name: Get server facts
openstack.cloud.os_server_facts: openstack.cloud.server_info:
cloud: default cloud: default
interface: internal interface: internal
verify: "{{ keystone_service_internaluri_insecure | ternary(false, true) }}" verify: "{{ keystone_service_internaluri_insecure | ternary(false, true) }}"
server: "{{ nova_vm.name }}" server: "{{ nova_vm.name }}"
register: openstack_servers_result
- name: Show server facts - name: Show server facts
debug: debug:
var: openstack_servers var: openstack_servers_result.openstack_servers
- name: Discover the healthcheck vm floating IP - name: Discover the healthcheck vm floating IP
set_fact: set_fact:
_floating_ip: "{{ openstack_servers | json_query(_query) }}" _floating_ip: "{{ openstack_servers_result.openstack_servers | json_query(_query) }}"
vars: vars:
_query: "[?name == '{{ nova_vm.name }}'].addresses.{{ nova_vm.network }}[] | [?contains(*,'floating')].addr" _query: "[?name == '{{ nova_vm.name }}'].addresses.{{ nova_vm.network }}[] | [?contains(*,'floating')].addr"