mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-01-09 23:12:10 -03:30
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.
This commit is contained in:
parent
bb4b2af02e
commit
25e4fa17a8
@ -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
Normal file
3
roles/bootstrap-os/meta/main.yml
Normal file
@ -0,0 +1,3 @@
|
||||
---
|
||||
dependencies:
|
||||
- role: kubespray-defaults
|
||||
@ -8,6 +8,7 @@
|
||||
roles:
|
||||
- role: kubespray-defaults
|
||||
- role: bootstrap-os
|
||||
- role: network_facts
|
||||
- role: kubernetes/preinstall
|
||||
- role: adduser
|
||||
user: "{{ addusers.kube }}"
|
||||
|
||||
@ -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
Normal file
3
roles/network_facts/meta/main.yml
Normal file
@ -0,0 +1,3 @@
|
||||
---
|
||||
dependencies:
|
||||
- role: kubespray-defaults
|
||||
3
roles/validate_inventory/meta/main.yml
Normal file
3
roles/validate_inventory/meta/main.yml
Normal file
@ -0,0 +1,3 @@
|
||||
---
|
||||
dependencies:
|
||||
- role: kubespray-defaults
|
||||
Loading…
x
Reference in New Issue
Block a user