saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #37993 from ticosax/remove-initdb-requirement

Browse source 
Remove initdb dependency to consume postgres module.
This commit is contained in:
Mike Place 2016-11-30 11:08:13 -07:00 • committed by GitHub
commit 4ef5c98845
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
salt/modules/postgres.py
View file

@ -53,7 +53,7 @@ except ImportError:
# Import salt libs
import salt.utils
import salt.utils.itertools
from salt.exceptions import SaltInvocationError
from salt.exceptions import CommandExecutionError, SaltInvocationError
# Import 3rd-party libs
import salt.ext.six as six
@ -113,9 +113,10 @@ _PRIVILEGE_TYPE_MAP = {
def __virtual__():
'''
Only load this module if the psql and initdb bin exist
Only load this module if the psql bin exist.
initdb bin might also be used, but its presence will be detected on runtime.
'''
utils = ['psql', 'initdb']
utils = ['psql']
if not HAS_CSV:
return False
for util in utils:
@ -145,7 +146,7 @@ def _find_pg_binary(util):
util_bin = salt.utils.which(util)
if not util_bin:
if pg_bin_dir:
return os.path.join(pg_bin_dir, util)
return salt.utils.which(os.path.join(pg_bin_dir, util))
else:
return util_bin
@ -221,6 +222,8 @@ def _run_initdb(name,
if user is None:
user = runas
_INITDB_BIN = _find_pg_binary('initdb')
if not _INITDB_BIN:
raise CommandExecutionError('initdb executable not found.')
cmd = [
_INITDB_BIN,
'--pgdata={0}'.format(name),