Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle multiple (redundant) masters #284

Merged
merged 1 commit into from Mar 29, 2016

Conversation

@aneeshusa
Copy link
Member

aneeshusa commented Mar 29, 2016

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.

See #281 (comment) for more details.

I haven't updated the common/map.jinja file yet; are we still using these hostnames in the /etc/hosts file or is everything happening via DNS lookups?


This change is Reviewable

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.
@edunham
Copy link
Contributor

edunham commented Mar 29, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Mar 29, 2016

📌 Commit bd07714 has been approved by edunham

@bors-servo
Copy link
Contributor

bors-servo commented Mar 29, 2016

Testing commit bd07714 with merge 6fe327f...

bors-servo added a commit that referenced this pull request Mar 29, 2016
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.

See #281 (comment) for more details.

I haven't updated the `common/map.jinja` file yet; are we still using these hostnames in the `/etc/hosts` file or is everything happening via DNS lookups?

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/284)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Mar 29, 2016

☀️ Test successful - travis

@bors-servo bors-servo merged commit bd07714 into servo:master Mar 29, 2016
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
bors-servo added a commit that referenced this pull request Apr 4, 2016
…strom

Target servo-master\d+ with PCRE in the top file

This fixes the targeting for servo-master\d+ so that the extra states
are actually applied.

I noticed this while reviewing the travis builds for #291.
This was missed in both #284 and #285!

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/292)
<!-- Reviewable:end -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.