Clarified and cleaned up grammar of error messages.
This commit is contained in:
parent
0e42b1708b
commit
2ba32a8b10
1 changed files with 8 additions and 8 deletions
|
@ -614,12 +614,12 @@ def await_resource(conn, resource, status, module):
|
||||||
if module.params.get('command') == 'snapshot':
|
if module.params.get('command') == 'snapshot':
|
||||||
# Temporary until all the rds2 commands have their responses parsed
|
# Temporary until all the rds2 commands have their responses parsed
|
||||||
if resource.name is None:
|
if resource.name is None:
|
||||||
module.fail_json(msg="Problem with snapshot %s" % resource.snapshot)
|
module.fail_json(msg="There was a problem waiting for RDS snapshot %s" % resource.snapshot)
|
||||||
resource = conn.get_db_snapshot(resource.name)
|
resource = conn.get_db_snapshot(resource.name)
|
||||||
else:
|
else:
|
||||||
# Temporary until all the rds2 commands have their responses parsed
|
# Temporary until all the rds2 commands have their responses parsed
|
||||||
if resource.name is None:
|
if resource.name is None:
|
||||||
module.fail_json(msg="Problem with instance %s" % resource.instance)
|
module.fail_json(msg="There was a problem waiting for RDS instance %s" % resource.instance)
|
||||||
resource = conn.get_db_instance(resource.name)
|
resource = conn.get_db_instance(resource.name)
|
||||||
if resource is None:
|
if resource is None:
|
||||||
break
|
break
|
||||||
|
@ -653,7 +653,7 @@ def create_db_instance(module, conn):
|
||||||
module.params.get('username'), module.params.get('password'), **params)
|
module.params.get('username'), module.params.get('password'), **params)
|
||||||
changed = True
|
changed = True
|
||||||
except RDSException, e:
|
except RDSException, e:
|
||||||
module.fail_json(msg="failed to create instance: %s" % e.message)
|
module.fail_json(msg="Failed to create instance: %s" % e.message)
|
||||||
|
|
||||||
if module.params.get('wait'):
|
if module.params.get('wait'):
|
||||||
resource = await_resource(conn, result, 'available', module)
|
resource = await_resource(conn, result, 'available', module)
|
||||||
|
@ -680,7 +680,7 @@ def replicate_db_instance(module, conn):
|
||||||
result = conn.create_db_instance_read_replica(instance_name, source_instance, **params)
|
result = conn.create_db_instance_read_replica(instance_name, source_instance, **params)
|
||||||
changed = True
|
changed = True
|
||||||
except RDSException, e:
|
except RDSException, e:
|
||||||
module.fail_json(msg="failed to create replica instance: %s " % e.message)
|
module.fail_json(msg="Failed to create replica instance: %s " % e.message)
|
||||||
|
|
||||||
if module.params.get('wait'):
|
if module.params.get('wait'):
|
||||||
resource = await_resource(conn, result, 'available', module)
|
resource = await_resource(conn, result, 'available', module)
|
||||||
|
@ -719,7 +719,7 @@ def delete_db_instance_or_snapshot(module, conn):
|
||||||
else:
|
else:
|
||||||
result = conn.delete_db_snapshot(snapshot)
|
result = conn.delete_db_snapshot(snapshot)
|
||||||
except RDSException, e:
|
except RDSException, e:
|
||||||
module.fail_json(msg="failed to delete instance: %s" % e.message)
|
module.fail_json(msg="Failed to delete instance: %s" % e.message)
|
||||||
|
|
||||||
# If we're not waiting for a delete to complete then we're all done
|
# If we're not waiting for a delete to complete then we're all done
|
||||||
# so just return
|
# so just return
|
||||||
|
@ -745,11 +745,11 @@ def facts_db_instance_or_snapshot(module, conn):
|
||||||
snapshot = module.params.get('snapshot')
|
snapshot = module.params.get('snapshot')
|
||||||
|
|
||||||
if instance_name and snapshot:
|
if instance_name and snapshot:
|
||||||
module.fail_json(msg="facts must be called with either instance_name or snapshot, not both")
|
module.fail_json(msg="Facts must be called with either instance_name or snapshot, not both")
|
||||||
if instance_name:
|
if instance_name:
|
||||||
resource = conn.get_db_instance(instance_name)
|
resource = conn.get_db_instance(instance_name)
|
||||||
if not resource:
|
if not resource:
|
||||||
module.fail_json(msg="DB Instance %s does not exist" % instance_name)
|
module.fail_json(msg="DB instance %s does not exist" % instance_name)
|
||||||
if snapshot:
|
if snapshot:
|
||||||
resource = conn.get_db_snapshot(snapshot)
|
resource = conn.get_db_snapshot(snapshot)
|
||||||
if not resource:
|
if not resource:
|
||||||
|
@ -1037,7 +1037,7 @@ def main():
|
||||||
|
|
||||||
region, ec2_url, aws_connect_params = get_aws_connection_info(module)
|
region, ec2_url, aws_connect_params = get_aws_connection_info(module)
|
||||||
if not region:
|
if not region:
|
||||||
module.fail_json(msg="region not specified and unable to determine region from EC2_REGION.")
|
module.fail_json(msg="Region not specified. Unable to determine region from EC2_REGION.")
|
||||||
|
|
||||||
# connect to the rds endpoint
|
# connect to the rds endpoint
|
||||||
if has_rds2:
|
if has_rds2:
|
||||||
|
|
Loading…
Reference in a new issue