Browse Source

Split kubespray-defaults (-> `network_facts`)

kubespray-defaults currently does two things:
- records a number of default variable values (in particular values used
  in several places)
- gather and compose some complex network facts (in particular,
  `fallback_ip` and `no_proxy`

There is no actual reason to couple those two things, and it makes using
defaults more difficult (because computing the network facts is somewhat
expensive, we don't want to do it willy-nilly)

Split the two and adjust import paths as needed.
pull/12185/head
Max Gautier 5 months ago
parent
commit
25e4fa17a8
Failed to extract signature
8 changed files with 14 additions and 1 deletions
  1. 4
      playbooks/facts.yml
  2. 3
      roles/bootstrap-os/meta/main.yml
  3. 1
      roles/container-engine/containerd/molecule/default/prepare.yml
  4. 1
      roles/container-engine/cri-o/molecule/default/prepare.yml
  5. 3
      roles/network_facts/meta/main.yml
  6. 0
      roles/network_facts/tasks/main.yaml
  7. 0
      roles/network_facts/tasks/no_proxy.yml
  8. 3
      roles/validate_inventory/meta/main.yml

4
playbooks/facts.yml

@ -7,13 +7,15 @@
environment: "{{ proxy_disable_env }}"
roles:
- { role: bootstrap-os, tags: bootstrap-os}
- { role: kubespray-defaults }
- name: Gather facts
hosts: k8s_cluster:etcd:calico_rr
gather_facts: false
tags: always
tasks:
- name: Gather and compute network facts
import_role:
name: network_facts
- name: Gather minimal facts
setup:
gather_subset: '!all'

3
roles/bootstrap-os/meta/main.yml

@ -0,0 +1,3 @@
---
dependencies:
- role: kubespray-defaults

1
roles/container-engine/containerd/molecule/default/prepare.yml

@ -8,6 +8,7 @@
roles:
- role: kubespray-defaults
- role: bootstrap-os
- role: network_facts
- role: kubernetes/preinstall
- role: adduser
user: "{{ addusers.kube }}"

1
roles/container-engine/cri-o/molecule/default/prepare.yml

@ -8,6 +8,7 @@
roles:
- role: kubespray-defaults
- role: bootstrap-os
- role: network_facts
- role: kubernetes/preinstall
- role: adduser
user: "{{ addusers.kube }}"

3
roles/network_facts/meta/main.yml

@ -0,0 +1,3 @@
---
dependencies:
- role: kubespray-defaults

roles/kubespray-defaults/tasks/main.yaml → roles/network_facts/tasks/main.yaml

roles/kubespray-defaults/tasks/no_proxy.yml → roles/network_facts/tasks/no_proxy.yml

3
roles/validate_inventory/meta/main.yml

@ -0,0 +1,3 @@
---
dependencies:
- role: kubespray-defaults
Loading…
Cancel
Save