move ssl_verify under 'netbox' config
This commit is contained in:
parent
53cb29a6d4
commit
9611400b22
3 changed files with 7 additions and 3 deletions
|
@ -89,6 +89,8 @@ INFO:root:Creating Disk Samsung SSD 850 S2RBNX0K101698D
|
|||
netbox:
|
||||
url: 'http://netbox.internal.company.com'
|
||||
token: supersecrettoken
|
||||
# uncomment to disable ssl verification
|
||||
# ssl_verify: false
|
||||
|
||||
# Network configuration
|
||||
network:
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
netbox:
|
||||
url: 'http://netbox.internal.company.com'
|
||||
token: supersecrettoken
|
||||
# uncomment to disable ssl verification
|
||||
# ssl_verify: false
|
||||
|
||||
network:
|
||||
ignore_interfaces: "(dummy.*|docker.*)"
|
||||
|
|
|
@ -32,6 +32,8 @@ def get_config():
|
|||
p.add_argument('--log_level', default='debug')
|
||||
p.add_argument('--netbox.url', help='Netbox URL')
|
||||
p.add_argument('--netbox.token', help='Netbox API Token')
|
||||
p.add_argument('--netbox.ssl_verify', default=True, action='store_true',
|
||||
help='Disable SSL verification')
|
||||
p.add_argument('--virtual.enabled', action='store_true', help='Is a virtual machine or not')
|
||||
p.add_argument('--virtual.cluster_name', help='Cluster name of VM')
|
||||
p.add_argument('--hostname_cmd', default=None,
|
||||
|
@ -69,8 +71,6 @@ def get_config():
|
|||
p.add_argument('--network.lldp', help='Enable auto-cabling feature through LLDP infos')
|
||||
p.add_argument('--inventory', action='store_true',
|
||||
help='Enable HW inventory (CPU, Memory, RAID Cards, Disks) feature')
|
||||
p.add_argument('--no_ssl_verify', default=False, action='store_true',
|
||||
help='Disable SSL verification')
|
||||
|
||||
options = p.parse_args()
|
||||
return options
|
||||
|
@ -86,7 +86,7 @@ def get_netbox_instance():
|
|||
url=get_config().netbox.url,
|
||||
token=get_config().netbox.token,
|
||||
)
|
||||
if get_config().no_ssl_verify:
|
||||
if get_config().netbox.ssl_verify is False:
|
||||
urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
|
||||
session = requests.Session()
|
||||
session.verify = False
|
||||
|
|
Loading…
Reference in a new issue