Skip to content

Commit 01af91b

Browse files
authored
Merge pull request #499 from stackhpc/upstream/2025.1-2025-12-01
Synchronise 2025.1 with upstream
2 parents bb8de05 + 1785385 commit 01af91b

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ansible/kayobe-target-venv.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
become: True
120120
when: virtualenv is not defined
121121

122-
- name: Ensure kolla-ansible virtualenv has docker SDK for python installed
122+
- name: Ensure kayobe virtualenv has docker SDK for python installed
123123
pip:
124124
name: docker
125125
state: latest

ansible/network-connectivity.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
ping {{ remote_ip }} -c1 -M do {% if mtu %} -s {{ mtu | int - icmp_overhead_bytes }}{% endif %}
7070
with_items: "{{ network_interfaces }}"
7171
loop_control:
72-
label: "{{ remote_host }} on {{ item }}"
72+
label: "{{ remote_host | default('none', true) }} on {{ item }}"
7373
when:
7474
- remote_hosts | length > 0
7575
- remote_ip | length > 0
@@ -90,6 +90,6 @@
9090
# when check: remote_ip | length > 0, would pass, but remote_ip was ''
9191
# in the command. Assumption was that this was being evaluated once
9292
# for the when clause and then again for the command. Bug?
93-
remote_host: "{{ remote_hosts | random(seed=ansible_facts.date_time.iso8601) }}"
93+
remote_host: "{{ remote_hosts | random(seed=ansible_facts.date_time.iso8601) if remote_hosts | length > 0 else '' }}"
9494
remote_ip: "{{ lookup('cached', 'vars', item ~ '_ips', default={})[remote_host] | default('', true) }}"
9595
mtu: "{{ item | net_mtu }}"

0 commit comments

Comments
 (0)