Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace deprecated 'with_dict' with 'loop' #7442

Merged
merged 1 commit into from
Apr 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion roles/download/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

- name: download | Download files / images
include_tasks: "{{ include_file }}"
with_dict: "{{ downloads | combine(kubeadm_images) }}"
loop: "{{ downloads | combine(kubeadm_images) | dict2items }}"
vars:
download: "{{ download_defaults | combine(item.value) }}"
include_file: "download_{% if download.container %}container{% else %}file{% endif %}.yml"
Expand Down
4 changes: 2 additions & 2 deletions roles/kubernetes/preinstall/tasks/0090-etchosts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
etc_hosts_localhosts_dict_target: >-
{%- set target_entries = (etc_hosts_localhosts_dict|default({})).get(item.key, []) | difference(item.value.get('unexpected' ,[])) -%}
{{ etc_hosts_localhosts_dict_target|default({}) | combine({item.key: (target_entries + item.value.expected)|unique}) }}
with_dict: "{{ etc_hosts_localhost_entries }}"
loop: "{{ etc_hosts_localhost_entries|dict2items }}"

- name: Hosts | Update (if necessary) hosts file
lineinfile:
Expand All @@ -66,7 +66,7 @@
state: present
backup: yes
unsafe_writes: yes
with_dict: "{{ etc_hosts_localhosts_dict_target }}"
loop: "{{ etc_hosts_localhosts_dict_target|dict2items }}"

# gather facts to update ansible_fqdn
- name: Update facts
Expand Down
21 changes: 7 additions & 14 deletions test-infra/image-builder/roles/kubevirt-images/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,29 @@
url: "{{ item.value.url }}"
dest: "{{ images_dir }}/{{ item.value.filename }}"
checksum: "{{ item.value.checksum }}"
with_dict:
- "{{ images }}"
loop: "{{ images|dict2items }}"

- name: Unxz compressed images
command: unxz --force {{ images_dir }}/{{ item.value.filename }}
with_dict:
- "{{ images }}"
loop: "{{ images|dict2items }}"
when:
- item.value.filename.endswith('.xz')

- name: Convert images which is not in qcow2 format
command: qemu-img convert -O qcow2 {{ images_dir }}/{{ item.value.filename.rstrip('.xz') }} {{ images_dir }}/{{ item.key }}.qcow2
with_dict:
- "{{ images }}"
loop: "{{ images|dict2items }}"
when:
- not (item.value.converted|bool)

- name: Make sure all images are ending with qcow2
command: cp {{ images_dir }}/{{ item.value.filename.rstrip('.xz') }} {{ images_dir }}/{{ item.key }}.qcow2
with_dict:
- "{{ images }}"
loop: "{{ images|dict2items }}"
when:
- item.value.converted|bool

- name: Resize images # noqa 301
command: qemu-img resize {{ images_dir }}/{{ item.key }}.qcow2 +8G
with_dict:
- "{{ images }}"
loop: "{{ images|dict2items }}"

# STEP 2: Include the images inside a container
- name: Template default Dockerfile
Expand All @@ -47,16 +42,14 @@

- name: Create docker images for each OS # noqa 301
command: docker build -t {{ registry }}/vm-{{ item.key }}:{{ item.value.tag }} --build-arg cloud_image="{{ item.key }}.qcow2" {{ images_dir }}
with_dict:
- "{{ images }}"
loop: "{{ images|dict2items }}"

- name: docker login # noqa 301
command: docker login -u="{{ docker_user }}" -p="{{ docker_password }}" "{{ docker_host }}"

- name: docker push image # noqa 301
command: docker push {{ registry }}/vm-{{ item.key }}:{{ item.value.tag }}
with_dict:
- "{{ images }}"
loop: "{{ images|dict2items }}"

- name: docker logout # noqa 301
command: docker logout -u="{{ docker_user }}" "{{ docker_host }}"