mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-05-19 14:57:43 -02:30
Rename bootstrap-os to bootstrap_os
Role names in ansible collections should not have hyphens.
This commit is contained in:
@@ -4,4 +4,4 @@
|
||||
gather_facts: false
|
||||
become: true
|
||||
roles:
|
||||
- role: bootstrap-os
|
||||
- role: bootstrap_os
|
||||
@@ -7,7 +7,7 @@
|
||||
ignore_assert_errors: true
|
||||
roles:
|
||||
- role: kubespray_defaults
|
||||
- role: bootstrap-os
|
||||
- role: bootstrap_os
|
||||
- role: network_facts
|
||||
- role: kubernetes/preinstall
|
||||
- role: adduser
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
become: true
|
||||
roles:
|
||||
- role: kubespray_defaults
|
||||
- role: bootstrap-os
|
||||
- role: bootstrap_os
|
||||
- role: adduser
|
||||
user: "{{ addusers.kube }}"
|
||||
tasks:
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
ignore_assert_errors: true
|
||||
roles:
|
||||
- role: kubespray_defaults
|
||||
- role: bootstrap-os
|
||||
- role: bootstrap_os
|
||||
- role: network_facts
|
||||
- role: kubernetes/preinstall
|
||||
- role: adduser
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
become: true
|
||||
roles:
|
||||
- role: kubespray_defaults
|
||||
- role: bootstrap-os
|
||||
- role: bootstrap_os
|
||||
- role: adduser
|
||||
user: "{{ addusers.kube }}"
|
||||
tasks:
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
become: true
|
||||
roles:
|
||||
- role: kubespray_defaults
|
||||
- role: bootstrap-os
|
||||
- role: bootstrap_os
|
||||
- role: adduser
|
||||
user: "{{ addusers.kube }}"
|
||||
tasks:
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
become: true
|
||||
roles:
|
||||
- role: kubespray_defaults
|
||||
- role: bootstrap-os
|
||||
- role: bootstrap_os
|
||||
- role: adduser
|
||||
user: "{{ addusers.kube }}"
|
||||
tasks:
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
- kubelet
|
||||
- kube-controller-manager
|
||||
- kube-apiserver
|
||||
- bootstrap-os
|
||||
- bootstrap_os
|
||||
- apps
|
||||
- network
|
||||
- master # master tag is deprecated and replaced by control-plane
|
||||
@@ -35,7 +35,7 @@
|
||||
- kubelet
|
||||
- kube-controller-manager
|
||||
- kube-apiserver
|
||||
- bootstrap-os
|
||||
- bootstrap_os
|
||||
- apps
|
||||
- network
|
||||
- master # master tag is deprecated and replaced by control-plane
|
||||
@@ -86,7 +86,7 @@
|
||||
- weave
|
||||
- kube-ovn
|
||||
- kube-router
|
||||
- bootstrap-os
|
||||
- bootstrap_os
|
||||
|
||||
- name: Create calico cni directories
|
||||
file:
|
||||
@@ -102,7 +102,7 @@
|
||||
tags:
|
||||
- network
|
||||
- calico
|
||||
- bootstrap-os
|
||||
- bootstrap_os
|
||||
|
||||
- name: Create local volume provisioner directories
|
||||
file:
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
- "'Amazon' not in ansible_distribution"
|
||||
- slc.stat.exists
|
||||
tags:
|
||||
- bootstrap-os
|
||||
- bootstrap_os
|
||||
|
||||
- name: Disable IPv6 DNS lookup
|
||||
lineinfile:
|
||||
@@ -34,7 +34,7 @@
|
||||
- disable_ipv6_dns
|
||||
- not ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk"]
|
||||
tags:
|
||||
- bootstrap-os
|
||||
- bootstrap_os
|
||||
|
||||
- name: Clean previously used sysctl file locations
|
||||
file:
|
||||
@@ -52,7 +52,7 @@
|
||||
get_mime: false
|
||||
register: sysctl_file_stat
|
||||
tags:
|
||||
- bootstrap-os
|
||||
- bootstrap_os
|
||||
|
||||
- name: Change sysctl file path to link source if linked
|
||||
set_fact:
|
||||
@@ -61,7 +61,7 @@
|
||||
- sysctl_file_stat.stat.islnk is defined
|
||||
- sysctl_file_stat.stat.islnk
|
||||
tags:
|
||||
- bootstrap-os
|
||||
- bootstrap_os
|
||||
|
||||
- name: Make sure sysctl file path folder exists
|
||||
file:
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
- systemd_resolved_enabled.rc != 0
|
||||
- networkmanager_enabled.rc != 0
|
||||
tags:
|
||||
- bootstrap-os
|
||||
- bootstrap_os
|
||||
- resolvconf
|
||||
|
||||
- name: Apply systemd-resolved settings
|
||||
@@ -42,7 +42,7 @@
|
||||
- resolvconf_mode == 'host_resolvconf'
|
||||
- systemd_resolved_enabled.rc == 0
|
||||
tags:
|
||||
- bootstrap-os
|
||||
- bootstrap_os
|
||||
- resolvconf
|
||||
|
||||
- name: Apply networkmanager unmanaged devices settings
|
||||
@@ -50,7 +50,7 @@
|
||||
when:
|
||||
- networkmanager_enabled.rc == 0
|
||||
tags:
|
||||
- bootstrap-os
|
||||
- bootstrap_os
|
||||
|
||||
- name: Apply networkmanager DNS settings
|
||||
import_tasks: 0063-networkmanager-dns.yml
|
||||
@@ -59,7 +59,7 @@
|
||||
- resolvconf_mode == 'host_resolvconf'
|
||||
- networkmanager_enabled.rc == 0
|
||||
tags:
|
||||
- bootstrap-os
|
||||
- bootstrap_os
|
||||
- resolvconf
|
||||
|
||||
- name: Apply system configurations
|
||||
@@ -67,7 +67,7 @@
|
||||
when:
|
||||
- not dns_late
|
||||
tags:
|
||||
- bootstrap-os
|
||||
- bootstrap_os
|
||||
|
||||
- name: Configure NTP
|
||||
import_tasks: 0081-ntp-configurations.yml
|
||||
@@ -75,12 +75,12 @@
|
||||
- not dns_late
|
||||
- ntp_enabled
|
||||
tags:
|
||||
- bootstrap-os
|
||||
- bootstrap_os
|
||||
|
||||
- name: Configure /etc/hosts
|
||||
import_tasks: 0090-etchosts.yml
|
||||
tags:
|
||||
- bootstrap-os
|
||||
- bootstrap_os
|
||||
- etchosts
|
||||
|
||||
- name: Configure dhclient
|
||||
@@ -91,7 +91,7 @@
|
||||
- dhclientconffile is defined
|
||||
- not ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk"]
|
||||
tags:
|
||||
- bootstrap-os
|
||||
- bootstrap_os
|
||||
- resolvconf
|
||||
|
||||
- name: Configure dhclient dhclient hooks
|
||||
@@ -102,7 +102,7 @@
|
||||
- dhclientconffile is defined
|
||||
- not ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk"]
|
||||
tags:
|
||||
- bootstrap-os
|
||||
- bootstrap_os
|
||||
- resolvconf
|
||||
|
||||
# We need to make sure the network is restarted early enough so that docker can later pick up the correct system
|
||||
@@ -120,7 +120,7 @@
|
||||
when:
|
||||
- not dns_late
|
||||
tags:
|
||||
- bootstrap-os
|
||||
- bootstrap_os
|
||||
|
||||
- name: Run calico checks
|
||||
include_role:
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
delay: "{{ retry_stagger | random + 3 }}"
|
||||
when:
|
||||
- ansible_pkg_mgr == 'zypper'
|
||||
tags: bootstrap-os
|
||||
tags: bootstrap_os
|
||||
|
||||
- name: Add debian 10 required repos
|
||||
when:
|
||||
- ansible_distribution == "Debian"
|
||||
- ansible_distribution_version == "10"
|
||||
tags:
|
||||
- bootstrap-os
|
||||
- bootstrap_os
|
||||
block:
|
||||
- name: Add Debian Backports apt repo
|
||||
apt_repository:
|
||||
@@ -44,7 +44,7 @@
|
||||
cache_valid_time: 3600
|
||||
when: ansible_os_family == "Debian"
|
||||
tags:
|
||||
- bootstrap-os
|
||||
- bootstrap_os
|
||||
|
||||
- name: Remove legacy docker repo file
|
||||
file:
|
||||
@@ -63,7 +63,7 @@
|
||||
- not is_fedora_coreos
|
||||
- epel_enabled | bool
|
||||
tags:
|
||||
- bootstrap-os
|
||||
- bootstrap_os
|
||||
|
||||
- name: Install packages requirements
|
||||
package:
|
||||
@@ -75,4 +75,4 @@
|
||||
delay: "{{ retry_stagger | random + 3 }}"
|
||||
when: not (ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk"] or is_fedora_coreos)
|
||||
tags:
|
||||
- bootstrap-os
|
||||
- bootstrap_os
|
||||
|
||||
Reference in New Issue
Block a user