salt-call ignores --config-dir resulting in failing gpg renderer

[bobrik]

Description of Issue/Question

Setup

I have GPG home not in /etc/salt/gpgkeys, but in /foo/salt/bar/gpgkeys.

Steps to Reproduce Issue

salt-call --local --file-root=/foo/salt/bar/states --pillar-root=/foo/salt/bar/pillar --config-dir=/foo/salt/bar state.highstate

I see logs:

, received: gpg: keyblock resource `/etc/salt/gpgkeys/secring.gpg': file open error

I expect gpg to use config dir provided via cli args.

Versions Report

# salt --versions-report
Salt Version:
           Salt: 2015.8.3

Dependency Versions:
         Jinja2: 2.8
       M2Crypto: 0.21.1
           Mako: Not Installed
         PyYAML: 3.11
          PyZMQ: 15.2.0
         Python: 2.7.9 (default, Mar  1 2015, 12:57:24)
           RAET: Not Installed
        Tornado: 4.3
            ZMQ: 4.0.5
           cffi: 0.8.6
       cherrypy: Not Installed
       dateutil: Not Installed
          gitdb: 0.6.4
      gitpython: 1.0.2
          ioflo: Not Installed
        libnacl: Not Installed
   msgpack-pure: Not Installed
 msgpack-python: 0.4.7
   mysql-python: 1.2.5
      pycparser: 2.10
       pycrypto: 2.6.1
         pygit2: Not Installed
   python-gnupg: 0.3.8
          smmap: 0.9.0
        timelib: Not Installed

System Versions:
           dist: debian 8.4
        machine: x86_64
        release: 4.4.10-cloudflare
         system: debian 8.4

[Ch3LL]

@bobrik I think the issue lies here I believe that should be grabbing config-dir from opts.

When in pdb I found this:

(Pdb) p salt.syspaths.CONFIG_DIR, 'gpgkeys'
('/etc/salt', 'gpgkeys')

(Pdb) p __opts__['config_dir']
'/test'

also to note I believe you can specify gpg_keydir in your minion configuration to get this working.

[rallytime]

@bobrik Can you give the fix in #34257 a try?

[bobrik]

@rallytime LGTM, thanks!

[rallytime]

Great! Thanks for confirming @bobrik!