Merge pull request #4941 from sivel/rax-clb-shared-vip

Add ability to specify a VirtualIP ID for sharing a VIP with another LB
This commit is contained in:
jctanner 2014-01-29 16:14:29 -08:00
commit 6265128c9e

View file

@ -74,6 +74,11 @@ options:
username:
description:
- Rackspace username (overrides C(credentials))
vip_id:
description:
- Virtual IP ID to use when creating the load balancer for purposes of
sharing an IP with another load balancer of another protocol
version_added: 1.5
wait:
description:
- wait for the balancer to be in state 'running' before returning
@ -165,7 +170,7 @@ def to_dict(obj):
def cloud_load_balancer(module, state, name, meta, algorithm, port, protocol,
vip_type, timeout, wait, wait_timeout):
vip_type, timeout, wait, wait_timeout, vip_id):
for arg in (state, name, port, protocol, vip_type):
if not arg:
module.fail_json(msg='%s is required for rax_clb' % arg)
@ -194,7 +199,7 @@ def cloud_load_balancer(module, state, name, meta, algorithm, port, protocol,
if not balancers:
try:
virtual_ips = [clb.VirtualIP(type=vip_type)]
virtual_ips = [clb.VirtualIP(type=vip_type, id=vip_id)]
balancer = clb.create(name, metadata=metadata, port=port,
algorithm=algorithm, protocol=protocol,
timeout=timeout, virtual_ips=virtual_ips)
@ -284,6 +289,7 @@ def main():
state=dict(default='present', choices=['present', 'absent']),
timeout=dict(type='int', default=30),
type=dict(choices=['PUBLIC', 'SERVICENET'], default='PUBLIC'),
vip_id=dict(),
wait=dict(type='bool'),
wait_timeout=dict(default=300),
)
@ -301,6 +307,7 @@ def main():
protocol = module.params.get('protocol')
state = module.params.get('state')
timeout = int(module.params.get('timeout'))
vip_id = module.params.get('vip_id')
vip_type = module.params.get('type')
wait = module.params.get('wait')
wait_timeout = int(module.params.get('wait_timeout'))
@ -308,7 +315,7 @@ def main():
setup_rax_module(module, pyrax)
cloud_load_balancer(module, state, name, meta, algorithm, port, protocol,
vip_type, timeout, wait, wait_timeout)
vip_type, timeout, wait, wait_timeout, vip_id)
# import module snippets