Use login_host for import and dump operations
This commit is contained in:
parent
0c00dcca34
commit
f6f7d3559d
1 changed files with 7 additions and 6 deletions
|
@ -103,14 +103,14 @@ def db_delete(cursor, db):
|
||||||
cursor.execute(query)
|
cursor.execute(query)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def db_dump(user, password, db_name, target):
|
def db_dump(host, user, password, db_name, target):
|
||||||
res = os.system("/usr/bin/mysqldump -q -u "+user+ " -p"+password+" "
|
res = os.system("/usr/bin/mysqldump -q -h "+host+"-u "+user+ " -p"+password+" "
|
||||||
+db_name+" > "
|
+db_name+" > "
|
||||||
+target)
|
+target)
|
||||||
return (res == 0)
|
return (res == 0)
|
||||||
|
|
||||||
def db_import(user, password, db_name, target):
|
def db_import(host, user, password, db_name, target):
|
||||||
res = os.system("/usr/bin/mysql -u "+user+ " -p"+password+" "
|
res = os.system("/usr/bin/mysql -h "+host+" -u "+user+ " -p"+password+" "
|
||||||
+db_name+" < "
|
+db_name+" < "
|
||||||
+target)
|
+target)
|
||||||
return (res == 0)
|
return (res == 0)
|
||||||
|
@ -191,6 +191,7 @@ def main():
|
||||||
login_password = mycnf_creds["passwd"]
|
login_password = mycnf_creds["passwd"]
|
||||||
elif login_password is None or login_user is None:
|
elif login_password is None or login_user is None:
|
||||||
module.fail_json(msg="when supplying login arguments, both login_user and login_password must be provided")
|
module.fail_json(msg="when supplying login arguments, both login_user and login_password must be provided")
|
||||||
|
login_host = module.params["login_host"]
|
||||||
|
|
||||||
if state in ['dump','import']:
|
if state in ['dump','import']:
|
||||||
if target is None:
|
if target is None:
|
||||||
|
@ -212,11 +213,11 @@ def main():
|
||||||
if state == "absent":
|
if state == "absent":
|
||||||
changed = db_delete(cursor, db)
|
changed = db_delete(cursor, db)
|
||||||
elif state == "dump":
|
elif state == "dump":
|
||||||
changed = db_dump(login_user, login_password, db, target)
|
changed = db_dump(login_host, login_user, login_password, db, target)
|
||||||
if not changed:
|
if not changed:
|
||||||
module.fail_json(msg="dump failed!")
|
module.fail_json(msg="dump failed!")
|
||||||
elif state == "import":
|
elif state == "import":
|
||||||
changed = db_import(login_user, login_password, db, target)
|
changed = db_import(login_host, login_user, login_password, db, target)
|
||||||
if not changed:
|
if not changed:
|
||||||
module.fail_json(msg="import failed!")
|
module.fail_json(msg="import failed!")
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Reference in a new issue