diff --git a/defaults/main.yml b/defaults/main.yml index f6e305c439617af03547558a7c80b7a60bc55b05..ddaedfb62ddb2bd0193a9f70e74ed9f20637d5a4 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 83d39e2b9d29db1bfbb4df0cd0c025edf4c9d1aa..205ef7aac732e7cd1545412fa8b40d8a487214f5 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 4eabdb0aab583a16a8c44232955285dfa3c3559b..d44a27be52fa573dd0aceccefbdad9affc2a3a5f 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