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

Revert "Expose cache_parameter_group_name in elasticache module"

Browse source 
This PR #1950 implements duplicate functionality to #1353
This reverts commit b04efa22c4.

Conflicts:
	cloud/amazon/elasticache.py
This commit is contained in:
Toshio Kuratomi 2015-11-02 17:27:20 -08:00 committed by Matt Clay
parent 4d74c1d508
commit a692b2e4af
1 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/ansible/modules/cloud/amazon/elasticache.py
View file

@ -43,12 +43,6 @@ options:
- The version number of the cache engine - The version number of the cache engine
required: false required: false
default: none default: none
cache_parameter_group_name:
description:
- The name of the cache parameter group to associate with this cache cluster. If this argument is omitted, the default cache parameter group for the specified engine will be used.
required: false
default: none
version_added: "2.0"
node_type: node_type:
description: description:
- The compute and memory capacity of the nodes in the cache cluster - The compute and memory capacity of the nodes in the cache cluster
@ -63,9 +57,9 @@ 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: none default: none
parameter_group: cache_parameter_group:
description: description:
- Specify non-default parameter group names to be associated with cache cluster - The name of the cache parameter group to associate with this cache cluster. If this argument is omitted, the default cache parameter group for the specified engine will be used.
required: false required: false
default: None default: None
cache_subnet_group: cache_subnet_group:
@ -161,12 +155,11 @@ class ElastiCacheManager(object):
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, parameter_group, cache_subnet_group, num_nodes, cache_port, parameter_group, cache_subnet_group,
cache_security_groups, security_group_ids, zone, wait, cache_security_groups, security_group_ids, zone, wait,
hard_modify, region, cache_parameter_group_name=None, **aws_connect_kwargs): hard_modify, region, **aws_connect_kwargs):
self.module = module self.module = module
self.name = name self.name = name
self.engine = engine self.engine = engine
self.cache_engine_version = cache_engine_version self.cache_engine_version = cache_engine_version
self.cache_parameter_group_name = cache_parameter_group_name
self.node_type = node_type self.node_type = node_type
self.num_nodes = num_nodes self.num_nodes = num_nodes
self.cache_port = cache_port self.cache_port = cache_port
@ -227,7 +220,6 @@ class ElastiCacheManager(object):
cache_node_type=self.node_type, cache_node_type=self.node_type,
engine=self.engine, engine=self.engine,
engine_version=self.cache_engine_version, engine_version=self.cache_engine_version,
cache_parameter_group_name=self.cache_parameter_group_name,
cache_security_group_names=self.cache_security_groups, cache_security_group_names=self.cache_security_groups,
security_group_ids=self.security_group_ids, security_group_ids=self.security_group_ids,
cache_parameter_group_name=self.parameter_group, cache_parameter_group_name=self.parameter_group,
@ -309,8 +301,7 @@ class ElastiCacheManager(object):
cache_parameter_group_name=self.parameter_group, cache_parameter_group_name=self.parameter_group,
security_group_ids=self.security_group_ids, 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)
cache_parameter_group_name=self.cache_parameter_group_name)
except boto.exception.BotoServerError, e: except boto.exception.BotoServerError, e:
self.module.fail_json(msg=e.message) self.module.fail_json(msg=e.message)
@ -496,7 +487,6 @@ def main():
name={'required': True}, name={'required': True},
engine={'required': False, 'default': 'memcached'}, engine={'required': False, 'default': 'memcached'},
cache_engine_version={'required': False}, cache_engine_version={'required': False},
cache_parameter_group_name={'required': False},
node_type={'required': False, 'default': 'cache.m1.small'}, node_type={'required': False, 'default': 'cache.m1.small'},
num_nodes={'required': False, 'default': None, 'type': 'int'}, num_nodes={'required': False, 'default': None, 'type': 'int'},
cache_port={'required': False, 'default': 11211, 'type': 'int'}, cache_port={'required': False, 'default': 11211, 'type': 'int'},
@ -525,7 +515,6 @@ def main():
state = module.params['state'] state = module.params['state']
engine = module.params['engine'] engine = module.params['engine']
cache_engine_version = module.params['cache_engine_version'] cache_engine_version = module.params['cache_engine_version']
cache_parameter_group_name = module.params['cache_parameter_group_name']
node_type = module.params['node_type'] node_type = module.params['node_type']
num_nodes = module.params['num_nodes'] num_nodes = module.params['num_nodes']
cache_port = module.params['cache_port'] cache_port = module.params['cache_port']
@ -552,16 +541,13 @@ def main():
module.fail_json(msg=str("Either region or AWS_REGION or EC2_REGION environment variable or boto config aws_region or ec2_region must be set.")) module.fail_json(msg=str("Either region or AWS_REGION or EC2_REGION environment variable or boto config aws_region or ec2_region must be set."))
elasticache_manager = ElastiCacheManager(module, name, engine, elasticache_manager = ElastiCacheManager(module, name, engine,
cache_engine_version, cache_engine_version, node_type,
node_type,
num_nodes, cache_port, num_nodes, cache_port,
parameter_group, parameter_group,
cache_subnet_group, cache_subnet_group,
cache_security_groups, cache_security_groups,
security_group_ids, zone, wait, security_group_ids, zone, wait,
hard_modify, region, hard_modify, region, **aws_connect_kwargs)
cache_parameter_group_name=cache_parameter_group_name,
**aws_connect_kwargs)
if state == 'present': if state == 'present':
elasticache_manager.ensure_present() elasticache_manager.ensure_present()