Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion library/junos_cli
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,14 @@ options:
- port number to use when connecting to the device
required: false
default: 830
ssh_private_key_file:
description:
- This can be used if you need to provide a private key rather than
loading the key into the ssh-key-ring/environment. if your
ssh-key requires a password, then you must provide it via
**passwd**
required: false
default: None
mode:
description:
- mode of console connection (telnet/serial). If mode is not
Expand Down Expand Up @@ -130,6 +138,7 @@ def main():
user=dict(required=False, default=os.getenv('USER')),
passwd=dict(required=False, default=None, no_log=True),
port=dict(required=False, default=830),
ssh_private_key_file=dict(required=False, default=None),
mode=dict(required=False, default=None),
timeout=dict(required=False, type='int', default=0),
logfile=dict(required=False, default=None),
Expand Down Expand Up @@ -162,7 +171,8 @@ def main():

try:
dev = Device(args['host'], user=args['user'], password=args['passwd'],
port=args['port'], mode=args['mode'], gather_facts=False).open()
port=args['port'], ssh_private_key_file=args['ssh_private_key_file'],
mode=args['mode'], gather_facts=False).open()
except Exception as err:
msg = 'unable to connect to {0}: {1}'.format(args['host'], str(err))
logging.error(msg)
Expand Down
12 changes: 11 additions & 1 deletion library/junos_commit
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,14 @@ options:
- port number to use when connecting to the device
required: false
default: 830
ssh_private_key_file:
description:
- This can be used if you need to provide a private key rather than
loading the key into the ssh-key-ring/environment. if your
ssh-key requires a password, then you must provide it via
**passwd**
required: false
default: None
mode:
description:
- mode of console connection (telnet/serial). If mode is not
Expand Down Expand Up @@ -119,6 +127,7 @@ def main():
user=dict(required=False, default=os.getenv('USER')),
passwd=dict(required=False, default=None, no_log=True),
port=dict(required=False, default=830),
ssh_private_key_file=dict(required=False, default=None),
mode=dict(required=False, default=None),
timeout=dict(required=False, default=0),
logfile=dict(required=False, default=None),
Expand Down Expand Up @@ -154,7 +163,8 @@ def main():

try:
dev = Device(args['host'], user=args['user'], password=args['passwd'],
port=args['port'], mode=args['mode'], gather_facts=False).open()
port=args['port'], ssh_private_key_file=args['ssh_private_key_file'],
mode=args['mode'], gather_facts=False).open()
except Exception as err:
msg = 'unable to connect to {0}: {1}'.format(args['host'], str(err))
logging.error(msg)
Expand Down
12 changes: 11 additions & 1 deletion library/junos_get_config
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,14 @@ options:
- port number to use when connecting to the device
required: false
default: 830
ssh_private_key_file:
description:
- This can be used if you need to provide a private key rather than
loading the key into the ssh-key-ring/environment. if your
ssh-key requires a password, then you must provide it via
**passwd**
required: false
default: None
mode:
description:
- mode of console connection (telnet/serial). If mode is not
Expand Down Expand Up @@ -133,6 +141,7 @@ def main():
user=dict(required=False, default=os.getenv('USER')),
passwd=dict(required=False, default=None, no_log=True),
port=dict(required=False, default=830),
ssh_private_key_file=dict(required=False, default=None),
mode=dict(required=False, default=None),
logfile=dict(required=False, default=None),
dest=dict(required=True, default=None),
Expand Down Expand Up @@ -168,7 +177,8 @@ def main():

try:
dev = Device(args['host'], user=args['user'], password=args['passwd'],
port=args['port'], mode=args['mode'], gather_facts=False).open()
port=args['port'], ssh_private_key_file=args['ssh_private_key_file'],
mode=args['mode'], gather_facts=False).open()
except Exception as err:
msg = 'unable to connect to {0}: {1}'.format(args['host'], str(err))
logging.error(msg)
Expand Down
12 changes: 11 additions & 1 deletion library/junos_get_facts
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,14 @@ options:
- port number to use when connecting to the device
required: false
default: 830
ssh_private_key_file:
description:
- This can be used if you need to provide a private key rather than
loading the key into the ssh-key-ring/environment. if your
ssh-key requires a password, then you must provide it via
**passwd**
required: false
default: None
mode:
description:
- mode of console connection (telnet/serial). If mode is not
Expand Down Expand Up @@ -143,6 +151,7 @@ def main():
user=dict(required=False, default=os.getenv('USER')),
passwd=dict(required=False, default=None, no_log=True),
port=dict(required=False, default=830),
ssh_private_key_file=dict(required=False, default=None),
mode=dict(required=False, default=None)),
supports_check_mode=True)

Expand All @@ -164,7 +173,8 @@ def main():
# via NETCONF
# -----------
dev = Device(m_args['host'], user=m_args['user'], passwd=m_args['passwd'], port=m_args['port'],
mode=m_args['mode'], gather_facts=True)
ssh_private_key_file=m_args['ssh_private_key_file'], mode=m_args['mode'],
gather_facts=True)
try:
dev.open()
except Exception as err:
Expand Down
12 changes: 11 additions & 1 deletion library/junos_get_table
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,14 @@ options:
- port number to use when connecting to the device
required: false
default: 830
ssh_private_key_file:
description:
- This can be used if you need to provide a private key rather than
loading the key into the ssh-key-ring/environment. if your
ssh-key requires a password, then you must provide it via
**passwd**
required: false
default: None
mode:
description:
- mode of console connection (telnet/serial). If mode is not
Expand Down Expand Up @@ -182,6 +190,7 @@ def main():
default=os.getenv('USER')),
passwd=dict(required=False, default=None, no_log=True),
port=dict(required=False, default=830),
ssh_private_key_file=dict(required=False, default=None),
mode=dict(required=False, default=None),
logfile=dict(required=False, default=None),
file=dict(required=True, default=None),
Expand Down Expand Up @@ -216,7 +225,8 @@ def main():
args['port']))
try:
dev = Device(args['host'], user=args['user'], password=args['passwd'],
port=args['port'], mode=args['mode'], gather_facts=False).open()
port=args['port'], ssh_private_key_file=args['ssh_private_key_file'],
mode=args['mode'], gather_facts=False).open()
except Exception as err:
msg = 'unable to connect to {0}: {1}'.format(args['host'], str(err))
logging.error(msg)
Expand Down
12 changes: 11 additions & 1 deletion library/junos_install_config
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,14 @@ options:
- port number to use when connecting to the device
required: false
default: 830
ssh_private_key_file:
description:
- This can be used if you need to provide a private key rather than
loading the key into the ssh-key-ring/environment. if your
ssh-key requires a password, then you must provide it via
**passwd**
required: false
default: None
mode:
description:
- mode of console connection (telnet/serial). If mode is not
Expand Down Expand Up @@ -230,7 +238,8 @@ def _load_via_netconf(module):

try:
dev = Device(args['host'], user=args['user'], password=args['passwd'], port=args['port'],
mode=args['mode'], gather_facts=False)
ssh_private_key_file=args['ssh_private_key_file'], mode=args['mode'],
gather_facts=False)
dev.open()
except Exception as err:
msg = 'unable to connect to {0}: {1}'.format(args['host'], str(err))
Expand Down Expand Up @@ -431,6 +440,7 @@ def main():
timeout=dict(required=False, default=0),
comment=dict(required=False, default=None),
port=dict(required=False, default=830),
ssh_private_key_file=dict(required=False, default=None),
mode=dict(required=False, default=None),
confirm=dict(required=False, default=None),
check_commit_wait=dict(required=False, default=None)
Expand Down
14 changes: 12 additions & 2 deletions library/junos_install_os
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,14 @@ options:
- port number to use when connecting to the device
required: false
default: 830
ssh_private_key_file:
description:
- This can be used if you need to provide a private key rather than
loading the key into the ssh-key-ring/environment. if your
ssh-key requires a password, then you must provide it via
**passwd**
required: false
default: None
'''

EXAMPLES = '''
Expand Down Expand Up @@ -221,7 +229,8 @@ def main():
no_copy=dict(required=False, type='bool', choices=BOOLEANS, default=False),
reboot=dict(required=False, type='bool', choices=BOOLEANS, default=True),
reboot_pause=dict(required=False, type='int', default=10),
port=dict(required=False, default=830)
port=dict(required=False, default=830),
ssh_private_key_file=dict(required=False, default=None)
),
supports_check_mode=True
)
Expand All @@ -242,7 +251,8 @@ def main():
# @@@ need to verify that the package file actually exists
# @@@ before proceeding.

dev = Device(args['host'], user=args['user'], password=args['passwd'], port=args['port'])
dev = Device(args['host'], user=args['user'], password=args['passwd'], port=args['port'],
ssh_private_key_file=args['ssh_private_key_file'])
try:
dev.open()
except Exception as err:
Expand Down
12 changes: 11 additions & 1 deletion library/junos_jsnapy
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,14 @@ options:
- port number to use when connecting to the device
required: false
default: 830
ssh_private_key_file:
description:
- This can be used if you need to provide a private key rather than
loading the key into the ssh-key-ring/environment. if your
ssh-key requires a password, then you must provide it via
**passwd**
required: false
default: None
mode:
description:
- mode of console connection (telnet/serial). If mode is not
Expand Down Expand Up @@ -284,6 +292,7 @@ def main():
user=dict(required=False, default=os.getenv('USER')),
passwd=dict(required=False, default=None, no_log=True),
port=dict(required=False, default=830),
ssh_private_key_file=dict(required=False, default=None),
mode=dict(required=False, default=None),
logfile=dict(required=False, default=None),
test_files=dict(required=False, type='list', default=None),
Expand Down Expand Up @@ -314,7 +323,8 @@ def main():

try:
dev = Device(args['host'], user=args['user'], password=args['passwd'],
port=args['port'], mode=args['mode'], gather_facts=False).open()
port=args['port'], ssh_private_key_file=args['ssh_private_key_file'],
mode=args['mode'], gather_facts=False).open()
except Exception as err:
msg = 'unable to connect to {0}: {1}'.format(args['host'], str(err))
logging.error(msg)
Expand Down
10 changes: 10 additions & 0 deletions library/junos_ping
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@ options:
- port number to use when connecting to the device
required: false
default: 830
ssh_private_key_file:
description:
- This can be used if you need to provide a private key rather than
loading the key into the ssh-key-ring/environment. if your
ssh-key requires a password, then you must provide it via
**passwd**
required: false
default: None
mode:
description:
- mode of console connection (telnet/serial). If mode is not
Expand Down Expand Up @@ -161,6 +169,7 @@ def main():
user=dict(required=False, default=os.getenv('USER')),
passwd=dict(required=False, default=None, no_log=True),
port=dict(required=False, default=830),
ssh_private_key_file=dict(required=False, default=None),
mode=dict(required=False, default=None),
timeout=dict(required=False, default=0),
dest_ip=dict(required=True, default=None),
Expand Down Expand Up @@ -195,6 +204,7 @@ def main():
user=m_args['user'],
passwd=m_args['passwd'],
port=m_args['port'],
ssh_private_key_file=m_args['ssh_private_key_file'],
mode=m_args['mode'],
gather_facts=False)

Expand Down
12 changes: 11 additions & 1 deletion library/junos_rollback
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,14 @@ options:
- port number to use when connecting to the device
required: false
default: 830
ssh_private_key_file:
description:
- This can be used if you need to provide a private key rather than
loading the key into the ssh-key-ring/environment. if your
ssh-key requires a password, then you must provide it via
**passwd**
required: false
default: None
mode:
description:
- mode of console connection (telnet/serial). If mode is not
Expand Down Expand Up @@ -135,6 +143,7 @@ def main():
user=dict(required=False, default=os.getenv('USER')),
passwd=dict(required=False, default=None, no_log=True),
port=dict(required=False, default=830),
ssh_private_key_file=dict(required=False, default=None),
mode=dict(required=False, default=None),
logfile=dict(required=False, default=None),
rollback=dict(required=True, default=None),
Expand Down Expand Up @@ -179,7 +188,8 @@ def main():

try:
dev = Device(args['host'], user=args['user'], password=args['passwd'],
port=args['port'], mode=args['mode'], gather_facts=False).open()
port=args['port'], ssh_private_key_file=args['ssh_private_key_file'],
mode=args['mode'], gather_facts=False).open()
except Exception as err:
msg = 'unable to connect to {0}: {1}'.format(args['host'], str(err))
logging.error(msg)
Expand Down
12 changes: 11 additions & 1 deletion library/junos_rpc
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@ options:
- port number to use when connecting to the device
required: false
default: 830
ssh_private_key_file:
description:
- This can be used if you need to provide a private key rather than
loading the key into the ssh-key-ring/environment. if your
ssh-key requires a password, then you must provide it via
**passwd**
required: false
default: None
mode:
description:
- mode of console connection (telnet/serial). If mode is not
Expand Down Expand Up @@ -266,6 +274,7 @@ def main():
user=dict(required=False, default=os.getenv('USER')),
passwd=dict(required=False, default=None, no_log=True),
port=dict(required=False, default=830),
ssh_private_key_file=dict(required=False, default=None),
mode=dict(required=False, default=None),
timeout=dict(required=False, type='int', default=0),
rpc=dict(required=True, default=None),
Expand All @@ -290,7 +299,8 @@ def main():
# via NETCONF
# -----------
dev = Device(m_args['host'], user=m_args['user'], passwd=m_args['passwd'],
port=m_args['port'], mode=m_args['mode'], gather_facts=False)
port=m_args['port'], ssh_private_key_file=m_args['ssh_private_key_file'],
mode=m_args['mode'], gather_facts=False)
try:
dev.open()
except Exception as err:
Expand Down
12 changes: 11 additions & 1 deletion library/junos_shutdown
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,14 @@ options:
- port number to use when connecting to the device
required: false
default: 830
ssh_private_key_file:
description:
- This can be used if you need to provide a private key rather than
loading the key into the ssh-key-ring/environment. if your
ssh-key requires a password, then you must provide it via
**passwd**
required: false
default: None
mode:
description:
- mode of console connection (telnet/serial). If mode is not
Expand Down Expand Up @@ -121,6 +129,7 @@ def main():
passwd=dict(required=False, default=None, no_log=True),
reboot=dict(required=False, type='bool', choices=BOOLEANS, default=False),
port=dict(required=False, default=830),
ssh_private_key_file=dict(required=False, default=None),
mode=dict(required=False, default=None),
in_min=dict(required=False, default=0),
at=dict(required=False, type='str', default=None)
Expand Down Expand Up @@ -154,7 +163,8 @@ def main():

try:
dev = Device(args['host'], user=args['user'], password=args['passwd'],
port=args['port'], mode=args['mode'], gather_facts=False).open()
port=args['port'], ssh_private_key_file=args['ssh_private_key_file'],
mode=args['mode'], gather_facts=False).open()
except Exception as err:
msg = 'unable to connect to {0}: {1}'.format(args['host'], str(err))
module.fail_json(msg=msg)
Expand Down
Loading