archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
8,274 Commits
55 Branches
673 Tags
557 MiB
Commit Graph

6 Commits (939294391562585218e07fc7ae0eb9f1efe588ff)

Author SHA1 Message Date
Bill Nottingham 0ce060122a Add lldpctl to requirements.
Brian Coca 5187c7fcd7 removed executable bit
Greg DeKoenigsberg 79ee13b542 Adding author's github id
Sébastien Gross 7c9217a8f7 [lldp] Merge wrapped lines. 
Some devices return their description on multiple lines such as:

    lldp.eth0.chassis.descr=cisco CISCO7609-S running on
    Cisco IOS Software, c7600s72033_rp Software (c7600s72033_rp-IPSERVICESK9-M), Version 12.2(33)SRE3, RELEASE SOFTWARE (fc1)
    Technical Support: http://www.cisco.com/techsupport
    Copyright (c) 1986-2011 by Cisco Systems, Inc.
    Compiled Wed 26-Jan-11 06:54 by prod_rel_team

The generated fact will result as:

    "descr": "cisco CISCO7609-S running on"

This patch fixes the line wrapping to return the full description
handling line breaks:

    "descr": "cisco CISCO7609-S running on\nCisco IOS Software, c7600s72033_rp Software (c7600s72033_rp-IPSERVICESK9-M), Version 12.2(33)SRE3, RELEASE SOFTWARE (fc1)\nTechnical Support: http://www.cisco.com/techsupport\nCopyright (c) 1986-2011 by Cisco Systems, Inc.\nCompiled Wed 26-Jan-11 06:54 by prod_rel_team"
Chad Norgan 8c94dd8b47 Ignore lines that do not have the key in them 
Some switches return multi-line output, which breaks the split function,
the change seeks to only preform the split on a line that has the key.
Michael DeHaan 1e777bb508 Fix rename error.