From 86becf489d216cb6de226d544ca128696f41357e Mon Sep 17 00:00:00 2001 From: Colin Wilk Date: Fri, 26 May 2023 23:51:14 +0200 Subject: Move hook ansible module config into their own config object Keep * prometheus_target_handler_command_enabled * prometheus_target_handler_command_become * prometheus_target_handler_shell_enabled * prometheus_target_handler_shell_become to avoid being overwritten when specifying prometheus_target_handler_command or prometheus_target_handler_shell Signed-off-by: Colin Wilk --- defaults/main.yml | 35 ++++++++++++++++++----------------- handlers/main.yml | 32 ++++++++++++++++---------------- 2 files changed, 34 insertions(+), 33 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 034ca13..8c0435b 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -7,28 +7,29 @@ prometheus_target_strategy: lineinfile ################################################################################ # handler configuration ################################################################################ - prometheus_target_handler_command_enabled: false prometheus_target_handler_command_become: true -# prometheus_target_handler_command_argv: -# prometheus_target_handler_command_chdir: -# prometheus_target_handler_command_cmd: -# prometheus_target_handler_command_creates: -# prometheus_target_handler_command_free_form: -# prometheus_target_handler_command_removes: -# prometheus_target_handler_command_stdin: -# prometheus_target_handler_command_stdin_add_newline: +# prometheus_target_handler_command: +# argv: +# chdir: +# cmd: +# creates: +# free_form: +# removes: +# stdin: +# stdin_add_newline: prometheus_target_handler_shell_enabled: false prometheus_target_handler_shell_become: true -# prometheus_target_handler_shell_chdir: -# prometheus_target_handler_shell_cmd: -# prometheus_target_handler_shell_creates: -# prometheus_target_handler_shell_executable: -# prometheus_target_handler_shell_free_form: -# prometheus_target_handler_shell_removes: -# prometheus_target_handler_shell_stdin: -# prometheus_target_handler_shell_stdin_add_newline: +# prometheus_target_handler_shell: +# chdir: +# cmd: +# creates: +# executable: +# free_form: +# removes: +# stdin: +# stdin_add_newline: ################################################################################ # lineinfile strategy configuration diff --git a/handlers/main.yml b/handlers/main.yml index 4b1aebb..f1db087 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,28 +1,28 @@ --- - name: Run command hook # noqa inline-env-var ansible.builtin.command: - argv: '{{ prometheus_target_handler_command_argv | default(omit) }}' - chdir: '{{ prometheus_target_handler_command_chdir | default(omit) }}' - cmd: '{{ prometheus_target_handler_command_cmd | default(omit) }}' - creates: '{{ prometheus_target_handler_command_creates | default(omit) }}' - free_form: '{{ prometheus_target_handler_command_free_form | default(omit) }}' - removes: '{{ prometheus_target_handler_command_removes | default(omit) }}' - stdin: '{{ prometheus_target_handler_command_stdin | default(omit) }}' - stdin_add_newline: '{{ prometheus_target_handler_command_stdin_add_newline | default(omit) }}' + argv: '{{ prometheus_target_handler_command.argv | default(omit) }}' + chdir: '{{ prometheus_target_handler_command.chdir | default(omit) }}' + cmd: '{{ prometheus_target_handler_command.cmd | default(omit) }}' + creates: '{{ prometheus_target_handler_command.creates | default(omit) }}' + free_form: '{{ prometheus_target_handler_command.free_form | default(omit) }}' + removes: '{{ prometheus_target_handler_command.removes | default(omit) }}' + stdin: '{{ prometheus_target_handler_command.stdin | default(omit) }}' + stdin_add_newline: '{{ prometheus_target_handler_command.stdin_add_newline | default(omit) }}' become: '{{ prometheus_target_handler_command_become }}' delegate_to: '{{ prometheus_target_host }}' when: prometheus_target_handler_command_enabled - name: Run shell hook ansible.builtin.shell: - chdir: '{{ prometheus_target_handler_shell_chdir | default(omit) }}' - cmd: '{{ prometheus_target_handler_shell_cmd | default(omit) }}' - creates: '{{ prometheus_target_handler_shell_creates | default(omit) }}' - executable: '{{ prometheus_target_handler_shell_executable | default(omit) }}' - free_form: '{{ prometheus_target_handler_shell_free_form | default(omit) }}' - removes: '{{ prometheus_target_handler_shell_removes | default(omit) }}' - stdin: '{{ prometheus_target_handler_shell_stdin | default(omit) }}' - stdin_add_newline: '{{ prometheus_target_handler_shell_stdin_add_newline | default(omit) }}' + chdir: '{{ prometheus_target_handler_shell.chdir | default(omit) }}' + cmd: '{{ prometheus_target_handler_shell.cmd | default(omit) }}' + creates: '{{ prometheus_target_handler_shell.creates | default(omit) }}' + executable: '{{ prometheus_target_handler_shell.executable | default(omit) }}' + free_form: '{{ prometheus_target_handler_shell.free_form | default(omit) }}' + removes: '{{ prometheus_target_handler_shell.removes | default(omit) }}' + stdin: '{{ prometheus_target_handler_shell.stdin | default(omit) }}' + stdin_add_newline: '{{ prometheus_target_handler_shell.stdin_add_newline | default(omit) }}' become: '{{ prometheus_target_handler_shell_become }}' delegate_to: '{{ prometheus_target_host }}' when: prometheus_target_handler_shell_enabled -- cgit v1.2.3