Browse Source

_ansible_item_label is not necessarily set (#3646)

pull/3664/head
Erwan Miran 6 years ago
committed by k8s-ci-robot
parent
commit
89ac53acd7
1 changed files with 4 additions and 4 deletions
  1. 8
      contrib/dind/roles/dind-host/tasks/main.yaml

8
contrib/dind/roles/dind-host/tasks/main.yaml

@ -52,7 +52,7 @@
{{ distro_raw_setup_done }} && echo SKIPPED && exit 0 {{ distro_raw_setup_done }} && echo SKIPPED && exit 0
until [ "$(readlink /proc/1/exe)" = "{{ distro_pid1_exe }}" ] ; do sleep 1; done until [ "$(readlink /proc/1/exe)" = "{{ distro_pid1_exe }}" ] ; do sleep 1; done
{{ distro_raw_setup }} {{ distro_raw_setup }}
delegate_to: "{{ item._ansible_item_label }}"
delegate_to: "{{ item._ansible_item_label|default(item.item) }}"
with_items: "{{ containers.results }}" with_items: "{{ containers.results }}"
register: result register: result
changed_when: result.stdout.find("SKIPPED") < 0 changed_when: result.stdout.find("SKIPPED") < 0
@ -62,7 +62,7 @@
until test -S /var/run/dbus/system_bus_socket; do sleep 1; done until test -S /var/run/dbus/system_bus_socket; do sleep 1; done
systemctl disable {{ distro_agetty_svc }} systemctl disable {{ distro_agetty_svc }}
systemctl stop {{ distro_agetty_svc }} systemctl stop {{ distro_agetty_svc }}
delegate_to: "{{ item._ansible_item_label }}"
delegate_to: "{{ item._ansible_item_label|default(item.item) }}"
with_items: "{{ containers.results }}" with_items: "{{ containers.results }}"
changed_when: false changed_when: false
@ -74,13 +74,13 @@
mv -b /etc/machine-id.new /etc/machine-id mv -b /etc/machine-id.new /etc/machine-id
cmp /etc/machine-id /etc/machine-id~ || true cmp /etc/machine-id /etc/machine-id~ || true
systemctl daemon-reload systemctl daemon-reload
delegate_to: "{{ item._ansible_item_label }}"
delegate_to: "{{ item._ansible_item_label|default(item.item) }}"
with_items: "{{ containers.results }}" with_items: "{{ containers.results }}"
- name: Early hack image install to adapt for DIND - name: Early hack image install to adapt for DIND
raw: | raw: |
rm -fv /usr/bin/udevadm /usr/sbin/udevadm rm -fv /usr/bin/udevadm /usr/sbin/udevadm
delegate_to: "{{ item._ansible_item_label }}"
delegate_to: "{{ item._ansible_item_label|default(item.item) }}"
with_items: "{{ containers.results }}" with_items: "{{ containers.results }}"
register: result register: result
changed_when: result.stdout.find("removed") >= 0 changed_when: result.stdout.find("removed") >= 0
Loading…
Cancel
Save