commit 15c0ac4da1e9af4df58a6b96c8115a419bafe467
author Dmitry Pyzhov <dpyzhov@mirantis.com> Tue Dec 11 17:10:08 2018 +0300
committer Dmitry Pyzhov <dpyzhov@mirantis.com> Fri Dec 14 19:02:12 2018 +0300
tree 00b7757f8edd8330face1aa39064b6ff0082e2b1
parent c69bfc073675acd824ab34181c64cb39ad16996f

Store gpg key on salt master

Related-PROD: PROD-23609 (PROD:23609)
Related-PROD: PROD-23611 (PROD:23611)

Change-Id: I77f90080f3678291af9d0f9f936f2d8811524513

config-drive/master_config.yaml

diff --git a/config-drive/master_config.yaml b/config-drive/master_config.yaml
index 3e68c74..c3db534 100644
--- a/config-drive/master_config.yaml
+++ b/config-drive/master_config.yaml
@@ -227,6 +227,11 @@
 
     echo "Configuring salt"
     envsubst < /root/minion.conf > /etc/salt/minion.d/minion.conf
+    if [ -f /mnt/gpg/salt_master_pillar.asc ]; then
+      mkdir /etc/salt/gpgkeys
+      chmod 700 /etc/salt/gpgkeys
+      GNUPGHOME=/etc/salt/gpgkeys gpg --import /mnt/gpg/salt_master_pillar.asc
+    fi
     enable_services
 
     # Wait for salt-master and salt-minion to wake up after restart