From 5ec8b2f4a278c3f1b5fd9de37951dfa51ac60e2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20L=C3=A1szl=C3=B3?= <rlacko99@gmail.com>
Date: Thu, 16 Sep 2021 17:03:42 +0200
Subject: [PATCH] Fix whens and skip authorized keys if keys_url is not defined
---
defaults/main.yml | 33 ++++++++++++++-------------------
tasks/main.yml | 5 -----
tasks/setup_user.yml | 1 +
3 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/defaults/main.yml b/defaults/main.yml
index f6e305c..ddaedfb 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -2,27 +2,22 @@
timezone: Europe/Budapest
na: "https://git.sch.bme.hu/kszk/sysadmin/kubernetes/base-ansible-role"
hostname: "{{ inventory_hostname }}"
-update: yes
-setup_basic_packages: yes
-disable_floppy: yes
-disable_multipath: yes
-vmware_multipath: yes
-motd_text: KSZK Host
+# motd_text: KSZK Host
-ssh:
- port: 10022
- pubkeyAuthentication: "yes"
- passwordAuthentication: "no"
- permitRootLogin: "without-password"
- allow:
- #users: root, ubuntu
- # groups: root
- # passwordLoginFrom:
- # custom:
- # enabled: False
- # ipList: "192.168.42.0/24"
+# ssh:
+# port: 10022
+# pubkeyAuthentication: "yes"
+# passwordAuthentication: "no"
+# permitRootLogin: "without-password"
+# allow:
+# users: root, ubuntu
+# groups: root
+# passwordLoginFrom:
+# custom:
+# enabled: False
+# ipList: "192.168.42.0/24"
-users:
+# users:
#- name: kszk
# comment: "kszk@sch.bme.hu" # optional
# sudo: yes
diff --git a/tasks/main.yml b/tasks/main.yml
index 83d39e2..205ef7a 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -8,19 +8,16 @@
tags: [hostname]
- name: Upgrade packages
- when: update is defined and update
import_tasks: update.yml
tags: [update]
- name: Setup admin users
- when: user is defined
include_tasks: setup_user.yml
loop: "{{ users }}"
loop_control:
loop_var: user
- name: Install basic packages
- when: setup_basic_packages is defined and setup_basic_packages
import_tasks: packages.yml
tags: [packages]
@@ -35,11 +32,9 @@
tags: [ssh]
- name: Disable floppy
- when: disable_floppy is defined and disable_floppy
include_tasks: floppy.yaml
- name: Fix multipath UUID VMWare errors
- when: vmware_multipath is defined and vmware_multipath
include_tasks: multipath.yaml
- name: Update netplan config
diff --git a/tasks/setup_user.yml b/tasks/setup_user.yml
index 4eabdb0..d44a27b 100644
--- a/tasks/setup_user.yml
+++ b/tasks/setup_user.yml
@@ -41,3 +41,4 @@
key: "{{ user.keys_url }}"
manage_dir: yes
exclusive: yes
+ when: user.keys_url is defined
--
GitLab