From e831be02ccc5a934a0b329e182c761254ebaab28 Mon Sep 17 00:00:00 2001 From: Rene Mewissen Date: Wed, 1 Oct 2025 15:22:11 +0200 Subject: [PATCH] changed syntax --- local.yml | 6 ------ roles/bastionhost/tasks/users/lowpriv.yml | 8 ++++++-- roles/bastionhost/tasks/users/sshjumpuser.yml | 8 ++++++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/local.yml b/local.yml index b6af87a..3946c23 100644 --- a/local.yml +++ b/local.yml @@ -11,12 +11,6 @@ ansible_pull_marker_file: /var/tmp/ansible_pull.last_run pre_tasks: - - name: pre-run | set global playbook directory fact - set_fact: - ansible_pull_playbook_dir: "{{ playbook_dir }}" - cacheable: true - tags: always - - name: pre-run | get status of marker file stat: path: "{{ ansible_pull_marker_file }}" diff --git a/roles/bastionhost/tasks/users/lowpriv.yml b/roles/bastionhost/tasks/users/lowpriv.yml index 6b50b03..d87aadf 100644 --- a/roles/bastionhost/tasks/users/lowpriv.yml +++ b/roles/bastionhost/tasks/users/lowpriv.yml @@ -22,7 +22,11 @@ user: "lowpriv" - name: users | lowpriv | import ssh configuration tasks from base role - import_tasks: "{{ ansible_pull_playbook_dir }}/roles/base/tasks/users/install_public_keys.yml" + include_role: + name: base + tasks_from: users/install_public_keys.yml - name: users | lowpriv | import known_hosts task from base role - import_tasks: "{{ ansible_pull_playbook_dir }}/roles/base/tasks/users/install_known_hosts.yml" \ No newline at end of file + include_role: + name: base + tasks_from: users/install_known_hosts.yml \ No newline at end of file diff --git a/roles/bastionhost/tasks/users/sshjumpuser.yml b/roles/bastionhost/tasks/users/sshjumpuser.yml index ce397cc..8cdb0cc 100644 --- a/roles/bastionhost/tasks/users/sshjumpuser.yml +++ b/roles/bastionhost/tasks/users/sshjumpuser.yml @@ -22,7 +22,11 @@ user: "sshjumpuser" - name: users | sshjumpuser | import ssh configuration tasks from base role - import_tasks: "{{ ansible_pull_playbook_dir }}/roles/base/tasks/users/install_public_keys.yml" + include_role: + name: base + tasks_from: users/install_public_keys.yml - name: users | sshjumpuser | import known_hosts task from base role - import_tasks: "{{ ansible_pull_playbook_dir }}/roles/base/tasks/users/install_known_hosts.yml" \ No newline at end of file + include_role: + name: base + tasks_from: users/install_known_hosts.yml \ No newline at end of file