Merge branch 'develop' into stable for v2015.03.15 release

saltstack · Mar 11, 2015 · 902da73 · 902da73
2 parents fe14312 + 004e25b
commit 902da73
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 /.project
 *.swp
+.vagrant
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+Version 2015.03.15:
+	* Add multi-master support. Thanks Fred Reimer(freimer). #555
+
 Version 2015.03.04:
 	* Fix the salt package selection on Arch stable installs.
 

diff --git a/README.rst b/README.rst
@@ -385,8 +385,6 @@ Ubuntu box. First, install Vagrant, then::
 
     $ vagrant up
     $ vagrant ssh
-    <vm> $ cd /salt_bootstrap
-    <vm> $ sudo sh salt-bootstrap.sh
 
 
 .. _Vagrant: http://www.vagrantup.com

diff --git a/Vagrantfile b/Vagrantfile
@@ -10,7 +10,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # please see the online documentation at vagrantup.com.
 
   # Every Vagrant virtual environment requires a box to build off of.
-  config.vm.box = "precise64"
+  config.vm.box = "ubuntu/precise64"
 
   # The url from where the 'config.vm.box' box will be fetched if it
   # doesn't already exist on the user's system.
@@ -40,6 +40,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # argument is a set of non-required options.
   config.vm.synced_folder ".", "/salt_bootstrap"
 
+  config.vm.provision "shell", path: "bootstrap-salt.sh"
   # Provider-specific configuration so you can fine-tune various
   # backing providers for Vagrant. These expose provider-specific options.
   # Example for VirtualBox:

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
@@ -17,7 +17,7 @@
 #       CREATED: 10/15/2012 09:49:37 PM WEST
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
-__ScriptVersion="2015.03.04"
+__ScriptVersion="2015.03.15"
 __ScriptName="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