mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-07-24 05:40:23 -07:00
Ssh config other options (#9684)
* Add other_options support to ssh_config module * Changelog fragment * Fix missing and modified stuff * Minor changes * Update fragment with PR URL * Fix PEP8 issue * Fix idempotency issue * Update changelogs/fragments/ssh_config_add_other_options.yml Co-authored-by: Felix Fontein <felix@fontein.de> * Update plugins/modules/ssh_config.py Co-authored-by: Felix Fontein <felix@fontein.de> * Update plugins/modules/ssh_config.py Co-authored-by: Felix Fontein <felix@fontein.de> * Incorporate suggestions * Missed removing str conversion * PEP8 * Update plugins/modules/ssh_config.py Co-authored-by: Felix Fontein <felix@fontein.de> * Add fail condition, fix codestyle * Force lower case key values only --------- Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
parent
bb2c45b5bb
commit
961c9b7f4c
3 changed files with 52 additions and 0 deletions
|
@ -22,6 +22,8 @@
|
|||
controlpath: "~/.ssh/sockets/%r@%h-%p"
|
||||
controlpersist: yes
|
||||
dynamicforward: '10080'
|
||||
other_options:
|
||||
serveraliveinterval: '30'
|
||||
state: present
|
||||
register: options_add
|
||||
check_mode: true
|
||||
|
@ -57,6 +59,8 @@
|
|||
controlpath: "~/.ssh/sockets/%r@%h-%p"
|
||||
controlpersist: yes
|
||||
dynamicforward: '10080'
|
||||
other_options:
|
||||
serveraliveinterval: '30'
|
||||
state: present
|
||||
register: options_add
|
||||
|
||||
|
@ -81,6 +85,8 @@
|
|||
controlpath: "~/.ssh/sockets/%r@%h-%p"
|
||||
controlpersist: yes
|
||||
dynamicforward: '10080'
|
||||
other_options:
|
||||
serveraliveinterval: '30'
|
||||
state: present
|
||||
register: options_add_again
|
||||
|
||||
|
@ -109,6 +115,7 @@
|
|||
- "'controlpath ~/.ssh/sockets/%r@%h-%p' in slurp_ssh_config['content'] | b64decode"
|
||||
- "'controlpersist yes' in slurp_ssh_config['content'] | b64decode"
|
||||
- "'dynamicforward 10080' in slurp_ssh_config['content'] | b64decode"
|
||||
- "'serveraliveinterval 30' in slurp_ssh_config['content'] | b64decode"
|
||||
|
||||
- name: Options - Update host
|
||||
community.general.ssh_config:
|
||||
|
@ -123,6 +130,8 @@
|
|||
controlpath: "~/.ssh/new-sockets/%r@%h-%p"
|
||||
controlpersist: "600"
|
||||
dynamicforward: '11080'
|
||||
other_options:
|
||||
serveraliveinterval: '30'
|
||||
state: present
|
||||
register: options_update
|
||||
|
||||
|
@ -149,6 +158,8 @@
|
|||
controlpath: "~/.ssh/new-sockets/%r@%h-%p"
|
||||
controlpersist: "600"
|
||||
dynamicforward: '11080'
|
||||
other_options:
|
||||
serveraliveinterval: '30'
|
||||
state: present
|
||||
register: options_update
|
||||
|
||||
|
@ -178,6 +189,7 @@
|
|||
- "'controlpath ~/.ssh/new-sockets/%r@%h-%p' in slurp_ssh_config['content'] | b64decode"
|
||||
- "'controlpersist 600' in slurp_ssh_config['content'] | b64decode"
|
||||
- "'dynamicforward 11080' in slurp_ssh_config['content'] | b64decode"
|
||||
- "'serveraliveinterval 30' in slurp_ssh_config['content'] | b64decode"
|
||||
|
||||
- name: Options - Ensure no update in case option exist in ssh_config file but wasn't defined in playbook
|
||||
community.general.ssh_config:
|
||||
|
@ -212,6 +224,7 @@
|
|||
- "'controlpath ~/.ssh/new-sockets/%r@%h-%p' in slurp_ssh_config['content'] | b64decode"
|
||||
- "'controlpersist 600' in slurp_ssh_config['content'] | b64decode"
|
||||
- "'dynamicforward 11080' in slurp_ssh_config['content'] | b64decode"
|
||||
- "'serveraliveinterval 30' in slurp_ssh_config['content'] | b64decode"
|
||||
|
||||
- name: Debug
|
||||
debug:
|
||||
|
@ -264,6 +277,7 @@
|
|||
- "'controlpath ~/.ssh/sockets/%r@%h-%p' not in slurp_ssh_config['content'] | b64decode"
|
||||
- "'controlpersist yes' not in slurp_ssh_config['content'] | b64decode"
|
||||
- "'dynamicforward 10080' not in slurp_ssh_config['content'] | b64decode"
|
||||
- "'serveraliveinterval 30' not in slurp_ssh_config['content'] | b64decode"
|
||||
|
||||
# Proxycommand and ProxyJump are mutually exclusive.
|
||||
# Reset ssh_config before testing options with proxyjump
|
||||
|
@ -286,6 +300,8 @@
|
|||
controlpath: "~/.ssh/sockets/%r@%h-%p"
|
||||
controlpersist: yes
|
||||
dynamicforward: '10080'
|
||||
other_options:
|
||||
serveraliveinterval: '30'
|
||||
state: present
|
||||
register: options_add
|
||||
check_mode: true
|
||||
|
@ -321,6 +337,8 @@
|
|||
controlpath: "~/.ssh/sockets/%r@%h-%p"
|
||||
controlpersist: yes
|
||||
dynamicforward: '10080'
|
||||
other_options:
|
||||
serveraliveinterval: '30'
|
||||
state: present
|
||||
register: options_add
|
||||
|
||||
|
@ -345,6 +363,8 @@
|
|||
controlpath: "~/.ssh/sockets/%r@%h-%p"
|
||||
controlpersist: yes
|
||||
dynamicforward: '10080'
|
||||
other_options:
|
||||
serveraliveinterval: '30'
|
||||
state: present
|
||||
register: options_add_again
|
||||
|
||||
|
@ -373,6 +393,7 @@
|
|||
- "'controlpath ~/.ssh/sockets/%r@%h-%p' in slurp_ssh_config['content'] | b64decode"
|
||||
- "'controlpersist yes' in slurp_ssh_config['content'] | b64decode"
|
||||
- "'dynamicforward 10080' in slurp_ssh_config['content'] | b64decode"
|
||||
- "'serveraliveinterval 30' in slurp_ssh_config['content'] | b64decode"
|
||||
|
||||
- name: Options - Update host
|
||||
community.general.ssh_config:
|
||||
|
@ -387,6 +408,8 @@
|
|||
controlpath: "~/.ssh/new-sockets/%r@%h-%p"
|
||||
controlpersist: "600"
|
||||
dynamicforward: '11080'
|
||||
other_options:
|
||||
serveraliveinterval: '30'
|
||||
state: present
|
||||
register: options_update
|
||||
|
||||
|
@ -413,6 +436,8 @@
|
|||
controlpath: "~/.ssh/new-sockets/%r@%h-%p"
|
||||
controlpersist: "600"
|
||||
dynamicforward: '11080'
|
||||
other_options:
|
||||
serveraliveinterval: '30'
|
||||
state: present
|
||||
register: options_update
|
||||
|
||||
|
@ -442,6 +467,7 @@
|
|||
- "'controlpath ~/.ssh/new-sockets/%r@%h-%p' in slurp_ssh_config['content'] | b64decode"
|
||||
- "'controlpersist 600' in slurp_ssh_config['content'] | b64decode"
|
||||
- "'dynamicforward 11080' in slurp_ssh_config['content'] | b64decode"
|
||||
- "'serveraliveinterval 30' in slurp_ssh_config['content'] | b64decode"
|
||||
|
||||
- name: Options - Ensure no update in case option exist in ssh_config file but wasn't defined in playbook
|
||||
community.general.ssh_config:
|
||||
|
@ -476,6 +502,7 @@
|
|||
- "'controlpath ~/.ssh/new-sockets/%r@%h-%p' in slurp_ssh_config['content'] | b64decode"
|
||||
- "'controlpersist 600' in slurp_ssh_config['content'] | b64decode"
|
||||
- "'dynamicforward 11080' in slurp_ssh_config['content'] | b64decode"
|
||||
- "'serveraliveinterval 30' in slurp_ssh_config['content'] | b64decode"
|
||||
|
||||
- name: Debug
|
||||
debug:
|
||||
|
@ -528,3 +555,4 @@
|
|||
- "'controlpath ~/.ssh/sockets/%r@%h-%p' not in slurp_ssh_config['content'] | b64decode"
|
||||
- "'controlpersist yes' not in slurp_ssh_config['content'] | b64decode"
|
||||
- "'dynamicforward 10080' not in slurp_ssh_config['content'] | b64decode"
|
||||
- "'serveraliveinterval 30' not in slurp_ssh_config['content'] | b64decode"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue