salt.master: move gpg_keydir to master

'gpg_keydir' is a master specific setting, it does not work under the
top level 'salt' key.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>

pillar/role/salt/master.sls

@@ -1,5 +1,4 @@
 salt:
-  gpg_keydir: ${'secret_salt:master:gpg_keydir'}
   interface: ${'secret_salt:master:interface'}
   master_remove_config: True
   extmods: {'modules': ['nbroles.py'], 'pillar': ['lookup.py']}
@@ -8,6 +7,7 @@ salt:
     cli_summary: True
     # to-do: package extension modules
     extension_modules: /opt/extmods
+    gpg_keydir: ${'secret_salt:master:gpg_keydir'}
     ipv6: True
     file_ignore_glob:
       - '*.pyc'