From 5601d6ce6be2f62baed1c4088764b2b6747eb6f0 Mon Sep 17 00:00:00 2001
From: Fred Reimer <Fred.Reimer@jmfamily.com>
Date: Tue, 10 Mar 2015 22:28:20 -0400
Subject: [PATCH] Add Multi-Master-PKI Capability for Minions

---
 bootstrap-salt.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index d1fb855..db18ed1 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -4510,6 +4510,12 @@ config_salt() {
             chmod 664 "$_PKI_DIR/minion/minion.pub" || return 1
             CONFIGURED_ANYTHING=$BS_TRUE
         fi
+        # For multi-master-pki, copy the master_sign public key if found
+        if [ -f "$_TEMP_CONFIG_DIR/master_sign.pub" ]; then
+            movefile "$_TEMP_CONFIG_DIR/master_sign.pub" "$_PKI_DIR/minion/" || return 1
+            chmod 664 "$_PKI_DIR/minion/master_sign.pub" || return 1
+            CONFIGURED_ANYTHING=$BS_TRUE
+        fi
     fi