From bf29ea55cf4e9eee55b72fa6576252780decb926 Mon Sep 17 00:00:00 2001
From: tenni <41963796+tenni-paws@users.noreply.github.com>
Date: Fri, 18 Aug 2023 18:14:29 +0300
Subject: [PATCH] fix: flatcar bootstrap (#10363)
---
roles/bootstrap-os/files/bootstrap.sh | 4 ++++
roles/kubernetes/preinstall/tasks/0081-ntp-configurations.yml | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/roles/bootstrap-os/files/bootstrap.sh b/roles/bootstrap-os/files/bootstrap.sh
index 69b7b7568..4c479a14c 100755
--- a/roles/bootstrap-os/files/bootstrap.sh
+++ b/roles/bootstrap-os/files/bootstrap.sh
@@ -39,4 +39,8 @@ mv -n "${PYPY_FILENAME}" pypy3
ln -s ./pypy3/bin/pypy3 python
$BINDIR/python --version
+# install PyYAML
+./python -m ensurepip
+./python -m pip install pyyaml
+
touch $BINDIR/.bootstrapped
diff --git a/roles/kubernetes/preinstall/tasks/0081-ntp-configurations.yml b/roles/kubernetes/preinstall/tasks/0081-ntp-configurations.yml
index 4efe1e3a1..ad00df3c2 100644
--- a/roles/kubernetes/preinstall/tasks/0081-ntp-configurations.yml
+++ b/roles/kubernetes/preinstall/tasks/0081-ntp-configurations.yml
@@ -30,7 +30,7 @@
ntp_service_name: >-
{% if ntp_package == "chrony" -%}
chronyd
- {%- elif ansible_os_family == 'RedHat' -%}
+ {%- elif ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk", "RedHat"] -%}
ntpd
{%- else -%}
ntp
--
GitLab