Skip to content

Commit

Permalink
replace more occurencies of facts injected as vars
Browse files Browse the repository at this point in the history
  • Loading branch information
fungusakafungus committed Jul 13, 2022
1 parent 42d8ba1 commit fc590b3
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions facts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@
gather_subset: '!all'

# filter match the following variables:
# ansible_default_ipv4
# ansible_default_ipv6
# ansible_all_ipv4_addresses
# ansible_all_ipv6_addresses
# ansible_facts.default_ipv4
# ansible_facts.default_ipv6
# ansible_facts.all_ipv4_addresses
# ansible_facts.all_ipv6_addresses
- name: Gather necessary facts (network)
setup:
gather_subset: '!all,!min,network'
filter: "ansible_*_ipv[46]*"

# filter match the following variables:
# ansible_memtotal_mb
# ansible_swaptotal_mb
# ansible_facts.memtotal_mb
# ansible_facts.swaptotal_mb
- name: Gather necessary facts (hardware)
setup:
gather_subset: '!all,!min,hardware'
Expand Down
12 changes: 6 additions & 6 deletions roles/container-engine/cri-o/tasks/crio_repo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,23 +118,23 @@
yum_repository:
name: devel_kubic_libcontainers_stable
description: Stable Releases of Upstream github.com/containers packages
baseurl: http://{{ crio_download_base }}/Fedora_{{ ansible_distribution_major_version }}/
baseurl: http://{{ crio_download_base }}/Fedora_{{ ansible_facts.distribution_major_version }}/
gpgcheck: yes
gpgkey: http://{{ crio_download_base }}/Fedora_{{ ansible_distribution_major_version }}/repodata/repomd.xml.key
gpgkey: http://{{ crio_download_base }}/Fedora_{{ ansible_facts.distribution_major_version }}/repodata/repomd.xml.key
keepcache: "0"
when:
- ansible_distribution in ["Fedora"]
- ansible_facts.distribution in ["Fedora"]
- not is_ostree

- name: Add CRI-O kubic yum repo
yum_repository:
name: "devel_kubic_libcontainers_stable_cri-o_{{ crio_version }}"
description: "CRI-O {{ crio_version }}"
baseurl: "{{ crio_download_crio }}{{ crio_version }}/Fedora_{{ ansible_distribution_major_version }}/"
baseurl: "{{ crio_download_crio }}{{ crio_version }}/Fedora_{{ ansible_facts.distribution_major_version }}/"
gpgcheck: yes
gpgkey: "{{ crio_download_crio }}{{ crio_version }}/Fedora_{{ ansible_distribution_major_version }}/repodata/repomd.xml.key"
gpgkey: "{{ crio_download_crio }}{{ crio_version }}/Fedora_{{ ansible_facts.distribution_major_version }}/repodata/repomd.xml.key"
when:
- ansible_distribution in ["Fedora"]
- ansible_facts.distribution in ["Fedora"]
- not is_ostree

- name: Add CRI-O kubic yum repo
Expand Down

0 comments on commit fc590b3

Please sign in to comment.