cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix default REST ports for http and https in openswitch (#15580)

Browse source 
properly uses the right default ports for http (80) and https (443)
This commit is contained in:
Peter Sprygada 2016-04-25 11:42:28 -04:00 committed by Nathaniel Case
parent 1a49267898
commit 2f411c9aa9
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/ansible/module_utils/openswitch.py
View file

@ -43,8 +43,9 @@ NET_COMMON_ARGS = dict(
password=dict(no_log=True, fallback=(env_fallback, ['ANSIBLE_NET_PASSWORD'])), password=dict(no_log=True, fallback=(env_fallback, ['ANSIBLE_NET_PASSWORD'])),
ssh_keyfile=dict(fallback=(env_fallback, ['ANSIBLE_NET_SSH_KEYFILE']), type='path'), ssh_keyfile=dict(fallback=(env_fallback, ['ANSIBLE_NET_SSH_KEYFILE']), type='path'),
use_ssl=dict(default=True, type='bool'), use_ssl=dict(default=True, type='bool'),
validate_certs=dict(default=True, type='bool'),
transport=dict(default='ssh', choices=['ssh', 'cli', 'rest']), transport=dict(default='ssh', choices=['ssh', 'cli', 'rest']),
provider=dict() provider=dict(type='dict')
) )
def to_list(val): def to_list(val):
@ -100,14 +101,17 @@ class Rest(object):
host = self.module.params['host'] host = self.module.params['host']
port = self.module.params['port'] port = self.module.params['port']
self.module.params['url_username'] = self.module.params['username']
self.module.params['url_password'] = self.module.params['password']
if self.module.params['use_ssl']: if self.module.params['use_ssl']:
proto = 'https' proto = 'https'
if not port: if not port:
port = 18091 port = 443
else: else:
proto = 'http' proto = 'http'
if not port: if not port:
port = 8091 port = 80
self.baseurl = '%s://%s:%s/rest/v1' % (proto, host, port) self.baseurl = '%s://%s:%s/rest/v1' % (proto, host, port)
@ -156,9 +160,10 @@ class Cli(object):
key_filename = self.module.params['ssh_keyfile'] key_filename = self.module.params['ssh_keyfile']
self.shell = Shell() self.shell = Shell()
self.shell.open(host, port=port, username=username, password=password, key_filename=key_filename) self.shell.open(host, port=port, username=username, password=password,
key_filename=key_filename)
def send(self, commands, encoding='text'): def send(self, commands):
return self.shell.send(commands) return self.shell.send(commands)
class NetworkModule(AnsibleModule): class NetworkModule(AnsibleModule):