From bd077140590b4b0c3edd724b7f1090b712265f2d Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Tue, 29 Mar 2016 07:17:36 -0400
Subject: [PATCH] Handle multiple (redundant) masters

Update the Salt states to handle multiple minions that host masters.
This will allow us to easily enter redundant multimaster mode to handle
switching over our master from Linode to EC2, by using separate IDs for
each machine instead of trying to reuse the `servo-master` ID.
---
 .travis.yml | 4 ++--
 top.sls     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ae85d932..58d382e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,13 +16,13 @@ matrix:
       os: linux
       sudo: required
       dist: trusty
-    - env: SALT_NODE_ID=servo-master
+    - env: SALT_NODE_ID=servo-master1
       os: linux
       sudo: required
       dist: trusty
   allow_failures:
     - env: SALT_NODE_ID=servo-linux-cross1
-  
+
 before_install:
   - .travis/install_salt -F -c .travis -- "${TRAVIS_OS_NAME}"
 
diff --git a/top.sls b/top.sls
index 09a8439f..e0498a05 100644
--- a/top.sls
+++ b/top.sls
@@ -29,7 +29,7 @@ base:
     - servo-build-dependencies
     - xvfb
 
-  'servo-master':
+  'servo-master\d+':
     - git
     - buildbot.master
     - homu