Default value for minion "master" parameter does not work

[tmandry]

When the master is also being configured. The problem is this line in salt/files/minion:

{{ get_config('master', 'salt') }}

If pillars['salt']['minion']['master'] does not exist, it will try pillars['salt']['master'], which of course is itself a dict.

[TimJones]

I am having the same issue. A temporary workaround is to provide an explicit master config for the minion template in the pillar:

salt:
  minion:
    master: salt
  master:
    ...

It's hacky but works until we can get a proper fix.

[blast-hardcheese]

fwiw, this workaround doesn't seem to work for me anymore (salt-master 2015.5.5 (Lithium)):

salt:
  minion:
    - master: salt
  master:
    fileserver_backend:
      - git
      - roots
    gitfs_provider: pygit2
    gitfs_remotes:
      - https://github.com/saltstack-formulas/salt-formula

[root@ip-172-31-52-196 srv]# salt-call pillar.get salt:master
local:
    ----------
    fileserver_backend:
        - git
        - roots
    gitfs_provider:
        pygit2
    gitfs_remotes:
        - https://github.com/saltstack-formulas/salt-formula

[blast-hardcheese]

This should be resolved as of #179

[gravyboat]

Thanks @blast-hardcheese, if this is not resolved please comment on this issue and we can reopen it.