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

added elasticache vpc security group ids

Browse source
This commit is contained in:
Isao Jonas 2014-02-12 08:53:29 -06:00
parent 15a4ba935c
commit 12d867b66d
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
cloud/elasticache
View file

@ -58,6 +58,11 @@ options:
- The port number on which each of the cache nodes will accept connections - The port number on which each of the cache nodes will accept connections
required: false required: false
default: 11211 default: 11211
security_group_ids:
description:
- A list of vpc security group names to associate with this cache cluster. Only use if inside a vpc
required: false
default: ['default']
cache_security_groups: cache_security_groups:
description: description:
- A list of cache security group names to associate with this cache cluster - A list of cache security group names to associate with this cache cluster
@ -152,7 +157,7 @@ class ElastiCacheManager(object):
EXIST_STATUSES = ['available', 'creating', 'rebooting', 'modifying'] EXIST_STATUSES = ['available', 'creating', 'rebooting', 'modifying']
def __init__(self, module, name, engine, cache_engine_version, node_type, def __init__(self, module, name, engine, cache_engine_version, node_type,
num_nodes, cache_port, cache_security_groups, zone, wait, num_nodes, cache_port, cache_security_groups, security_group_ids, zone, wait,
hard_modify, aws_access_key, aws_secret_key, region): hard_modify, aws_access_key, aws_secret_key, region):
self.module = module self.module = module
self.name = name self.name = name
@ -162,6 +167,7 @@ class ElastiCacheManager(object):
self.num_nodes = num_nodes self.num_nodes = num_nodes
self.cache_port = cache_port self.cache_port = cache_port
self.cache_security_groups = cache_security_groups self.cache_security_groups = cache_security_groups
self.security_group_ids = security_group_ids
self.zone = zone self.zone = zone
self.wait = wait self.wait = wait
self.hard_modify = hard_modify self.hard_modify = hard_modify
@ -217,6 +223,7 @@ class ElastiCacheManager(object):
engine=self.engine, engine=self.engine,
engine_version=self.cache_engine_version, engine_version=self.cache_engine_version,
cache_security_group_names=self.cache_security_groups, cache_security_group_names=self.cache_security_groups,
security_group_ids=self.security_group_ids,
preferred_availability_zone=self.zone, preferred_availability_zone=self.zone,
port=self.cache_port) port=self.cache_port)
except boto.exception.BotoServerError, e: except boto.exception.BotoServerError, e:
@ -291,6 +298,7 @@ class ElastiCacheManager(object):
num_cache_nodes=self.num_nodes, num_cache_nodes=self.num_nodes,
cache_node_ids_to_remove=nodes_to_remove, cache_node_ids_to_remove=nodes_to_remove,
cache_security_group_names=self.cache_security_groups, cache_security_group_names=self.cache_security_groups,
security_group_ids=self.security_group_ids,
apply_immediately=True, apply_immediately=True,
engine_version=self.cache_engine_version) engine_version=self.cache_engine_version)
except boto.exception.BotoServerError, e: except boto.exception.BotoServerError, e:
@ -377,12 +385,20 @@ class ElastiCacheManager(object):
if self.data[key] != value: if self.data[key] != value:
return True return True
# Check security groups # Check cache security groups
cache_security_groups = [] cache_security_groups = []
for sg in self.data['CacheSecurityGroups']: for sg in self.data['CacheSecurityGroups']:
cache_security_groups.append(sg['CacheSecurityGroupName']) cache_security_groups.append(sg['CacheSecurityGroupName'])
if set(cache_security_groups) - set(self.cache_security_groups): if set(cache_security_groups) - set(self.cache_security_groups):
return True return True
# check vpc security groups
vpc_security_groups = []
for sg in self.data['SecurityGroups']:
vpc_security_groups.append(sg['SecurityGroupId'])
if set(vpc_security_groups) - set(self.security_group_ids):
return True
return False return False
def _requires_destroy_and_create(self): def _requires_destroy_and_create(self):
@ -469,6 +485,8 @@ def main():
cache_port={'required': False, 'default': 11211, 'type': 'int'}, cache_port={'required': False, 'default': 11211, 'type': 'int'},
cache_security_groups={'required': False, 'default': ['default'], cache_security_groups={'required': False, 'default': ['default'],
'type': 'list'}, 'type': 'list'},
security_group_ids={'required': False, 'default': [],
'type': 'list'},
zone={'required': False, 'default': None}, zone={'required': False, 'default': None},
ec2_secret_key={'default': None, ec2_secret_key={'default': None,
'aliases': ['aws_secret_key', 'secret_key'], 'aliases': ['aws_secret_key', 'secret_key'],
@ -493,6 +511,7 @@ def main():
num_nodes = module.params['num_nodes'] num_nodes = module.params['num_nodes']
cache_port = module.params['cache_port'] cache_port = module.params['cache_port']
cache_security_groups = module.params['cache_security_groups'] cache_security_groups = module.params['cache_security_groups']
security_group_ids = module.params['security_group_ids']
zone = module.params['zone'] zone = module.params['zone']
wait = module.params['wait'] wait = module.params['wait']
hard_modify = module.params['hard_modify'] hard_modify = module.params['hard_modify']
@ -506,7 +525,8 @@ def main():
elasticache_manager = ElastiCacheManager(module, name, engine, elasticache_manager = ElastiCacheManager(module, name, engine,
cache_engine_version, node_type, cache_engine_version, node_type,
num_nodes, cache_port, num_nodes, cache_port,
cache_security_groups, zone, wait, cache_security_groups,
security_group_ids, zone, wait,
hard_modify, aws_access_key, hard_modify, aws_access_key,
aws_secret_key, region) aws_secret_key, region)