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

Add number to the buildmaster salt minion names #285

Merged
merged 1 commit into from Mar 29, 2016

Conversation

@edunham
Copy link
Contributor

edunham commented Mar 29, 2016

Workflow for this:

  • Land PR
  • pull configs on Linode servo-master
  • Edit linode servo-master's /etc/salt/minion to s/servo-master/servo-master0
  • Possibly jump through the key acceptance hoops
  • highstate servo-master0 to make sure it works

r? @larsbergstrom


This change is Reviewable

@larsbergstrom
Copy link
Contributor

larsbergstrom commented Mar 29, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Mar 29, 2016

📌 Commit 76a9cd1 has been approved by larsbergstrom

@bors-servo
Copy link
Contributor

bors-servo commented Mar 29, 2016

Testing commit 76a9cd1 with merge 6276254...

bors-servo added a commit that referenced this pull request Mar 29, 2016
Add number to the buildmaster salt minion names

Workflow for this:

* Land PR
* pull configs on Linode servo-master
* Edit linode servo-master's `/etc/salt/minion` to s/servo-master/servo-master0
* Possibly jump through the key acceptance hoops
* highstate servo-master0 to make sure it works

r? @larsbergstrom

<!-- 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/285)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Mar 29, 2016

☀️ Test successful - travis

@bors-servo bors-servo merged commit 76a9cd1 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.