Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upFix Vagrantfile after adding test suite. #298
Merged
Conversation
The install_salt.sh script was moved, so use the new name, and filter out the 'test' node when making the list of VMs.
|
Sadly I don't think it's feasible to test the Vagrant configuration on Travis :( |
|
I'd appreciate if someone could review this - it would make testing a lot easier, especially when doing heavy rebasing. |
|
Tested locally and it looks good to me. @bors-servo r+ |
|
|
bors-servo
added a commit
that referenced
this pull request
May 6, 2016
Fix Vagrantfile after adding test suite. The install_salt.sh script was moved, so use the new name, and filter out the 'test' node when making the list of VMs. <!-- 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/298) <!-- Reviewable:end -->
|
|
bors-servo
added a commit
that referenced
this pull request
Aug 10, 2016
Salt the Salt master Use Salt to install the Salt master. The Salt master will get restart on configuration changes, but will need to be manually restarted on package changes to allow for proper ordering of updating. (Salt masters must be updated before Salt minions.) Use Jinja to generate the config file YAML directly, preventing typos in the master config file and providing access to master configuration options in the SLS file (e.g. the file_roots locations). Incorporates and thus fixes #298. TODO: - [x] Add gitfs support. Fixes #264. - [x] Add _modules/ dir and backport `launchctl.py` module TODO after landing: - [ ] Add master install instructions to the wiki - [ ] Update Salt-inside-Vagrant usage instructions on the wiki After I finish the WIP tasks, landing this will unblock a bunch of other things that need the `launchctl.py` module (upgraded ssh, salt-minion salting, upgrading salt, etc.) <!-- 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/350) <!-- Reviewable:end -->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
aneeshusa commentedApr 5, 2016
The install_salt.sh script was moved, so use the new name,
and filter out the 'test' node when making the list of VMs.
This change is