diff --git a/roles/bootstrap-os/files/bootstrap.sh b/roles/bootstrap-os/files/bootstrap.sh index 69b7b7568fec394548776afe2dc22309d0668ef9..4c479a14c92e08be4b70daae7ef0fb2929b7ac19 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 4efe1e3a1db28b3f8de3ffcd3f71accbf256556b..ad00df3c2529720883d795520a4d9452c0258b46 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