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

Merge pull request #672 from sivel/rax-cdb-db-fixups

Browse source 
rax_cdb_database: Remove unnecessary logic, return the database on delete
This commit is contained in:
Matt Martz 2015-01-28 11:46:58 -06:00
commit 835f762cbb
1 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cloud/rackspace/rax_cdb_database.py
View file

@ -79,12 +79,6 @@ def find_database(instance, name):
def save_database(module, cdb_id, name, character_set, collate): def save_database(module, cdb_id, name, character_set, collate):
for arg, value in dict(cdb_id=cdb_id, name=name).iteritems():
if not value:
module.fail_json(msg='%s is required for the "rax_cdb_database" '
'module' % arg)
cdb = pyrax.cloud_databases cdb = pyrax.cloud_databases
try: try:
@ -111,12 +105,6 @@ def save_database(module, cdb_id, name, character_set, collate):
def delete_database(module, cdb_id, name): def delete_database(module, cdb_id, name):
for arg, value in dict(cdb_id=cdb_id, name=name).iteritems():
if not value:
module.fail_json(msg='%s is required for the "rax_cdb_database" '
'module' % arg)
cdb = pyrax.cloud_databases cdb = pyrax.cloud_databases
try: try:
@ -136,7 +124,8 @@ def delete_database(module, cdb_id, name):
else: else:
changed = True changed = True
module.exit_json(changed=changed, action='delete') module.exit_json(changed=changed, action='delete',
database=rax_to_dict(database))
def rax_cdb_database(module, state, cdb_id, name, character_set, collate): def rax_cdb_database(module, state, cdb_id, name, character_set, collate):