Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
hshbase-formula
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
salt
hshbase-formula
Commits
7d397840
Commit
7d397840
authored
5 years ago
by
Jan Philipp Timme
Browse files
Options
Downloads
Patches
Plain Diff
First step to make Vagrantfile work with Debian Buster 64
parent
58311333
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
Vagrantfile
+7
-9
7 additions, 9 deletions
Vagrantfile
with
7 additions
and
9 deletions
Vagrantfile
+
7
−
9
View file @
7d397840
...
...
@@ -2,8 +2,8 @@
# vi: set ft=ruby :
Vagrant
.
configure
(
2
)
do
|
config
|
# lets us debian
jessie
amd64 as base.
config
.
vm
.
box
=
"debian/
jessie
64"
# lets us debian
buster
amd64 as base.
config
.
vm
.
box
=
"debian/
buster
64"
# sync working dir; ignore folders that were created by node and grunt
config
.
vm
.
synced_folder
"."
,
"/vagrant"
,
type:
"rsync"
,
...
...
@@ -11,28 +11,26 @@ Vagrant.configure(2) do |config|
# install those to be able to use gitfs for node formula
config
.
vm
.
provision
:shell
,
:inline
=>
"sudo apt-get -y install git-core"
config
.
vm
.
provision
:shell
,
:inline
=>
"sudo apt-get -y install python-setuptools"
config
.
vm
.
provision
:shell
,
:inline
=>
"sudo easy_install GitPython"
config
.
vm
.
provision
:shell
,
:inline
=>
"sudo apt-get -y install python3-setuptools"
# Don't install GitPython, we should not need it on debian buster
# config.vm.provision :shell, :inline => "sudo easy_install GitPython"
config
.
vm
.
provision
:shell
,
:inline
=>
"ln -s /vagrant/.saltstack/salt /srv/"
config
.
vm
.
provision
:shell
,
:inline
=>
"ln -s /vagrant/.saltstack/pillar /srv/"
config
.
vm
.
provision
:salt
do
|
salt
|
# Workaround for:
# Copying salt minion config to /etc/salt
# Failed to upload a file to the guest VM via SCP due to a permissions
# error. [...]; @see:
# https://github.com/mitchellh/vagrant/issues/5973#issuecomment-137276605
salt
.
bootstrap_options
=
'-F -c /tmp/ -P'
# JPT: Added -x python3, so this actually grabs existing repo urls.
salt
.
bootstrap_options
=
'-F -c /tmp/ -P -x python3'
salt
.
masterless
=
true
salt
.
minion_config
=
".saltstack/minion"
salt
.
run_highstate
=
true
salt
.
verbose
=
true
end
# forward some service port from guest to host for testing?!
# config.vm.network "forwarded_port", guest:80, host:8888, host_ip:"localhost"
end
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment