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
28d5425b
Commit
28d5425b
authored
5 years ago
by
Jan Philipp Timme
Browse files
Options
Downloads
Patches
Plain Diff
Make gitfs work with python3, document Vagrantfile a bit
parent
7d397840
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
.saltstack/minion
+2
-2
2 additions, 2 deletions
.saltstack/minion
Vagrantfile
+10
-8
10 additions, 8 deletions
Vagrantfile
with
12 additions
and
10 deletions
.saltstack/minion
+
2
−
2
View file @
28d5425b
...
@@ -2,11 +2,11 @@ state_verbose: True
...
@@ -2,11 +2,11 @@ state_verbose: True
file_client: local
file_client: local
gitfs_provider: git
python
gitfs_provider:
py
git
2
fileserver_backend:
fileserver_backend:
- roots
- roots
- git
- git
fs
# Use this if you wanne use gitfs formulas!
# Use this if you wanne use gitfs formulas!
#gitfs_remotes:
#gitfs_remotes:
...
...
This diff is collapsed.
Click to expand it.
Vagrantfile
+
10
−
8
View file @
28d5425b
...
@@ -2,28 +2,30 @@
...
@@ -2,28 +2,30 @@
# vi: set ft=ruby :
# vi: set ft=ruby :
Vagrant
.
configure
(
2
)
do
|
config
|
Vagrant
.
configure
(
2
)
do
|
config
|
#
l
ets us debian buster amd64 as base.
#
L
ets us debian buster amd64 as base.
config
.
vm
.
box
=
"debian/buster64"
config
.
vm
.
box
=
"debian/buster64"
#
s
ync working dir; ignore folders that were created by node and grunt
#
S
ync working dir; ignore folders that were created by node and grunt
config
.
vm
.
synced_folder
"."
,
"/vagrant"
,
type:
"rsync"
,
config
.
vm
.
synced_folder
"."
,
"/vagrant"
,
type:
"rsync"
,
rsync__exclude:
[
".git/"
,]
rsync__exclude:
[
".git/"
,]
#
i
nstall those to be able to use gitfs
for node formula
#
I
nstall those to be able to use gitfs
config
.
vm
.
provision
:shell
,
:inline
=>
"sudo apt-get -y install git-core"
config
.
vm
.
provision
:shell
,
:inline
=>
"sudo apt-get -y install git-core
python3-pygit2
"
config
.
vm
.
provision
:shell
,
:inline
=>
"sudo apt-get -y install python3-setuptools"
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"
# Symlink states + pillar to /srv
config
.
vm
.
provision
:shell
,
:inline
=>
"ln -s /vagrant/.saltstack/salt /srv/"
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
:shell
,
:inline
=>
"ln -s /vagrant/.saltstack/pillar /srv/"
# Use vagrant salt provisioner (uses most recent salt-bootstrap script)
# See https://www.vagrantup.com/docs/provisioning/salt.html
config
.
vm
.
provision
:salt
do
|
salt
|
config
.
vm
.
provision
:salt
do
|
salt
|
# Workaround for:
# Workaround for:
# Copying salt minion config to /etc/salt
# Copying salt minion config to /etc/salt
# Failed to upload a file to the guest VM via SCP due to a permissions
# Failed to upload a file to the guest VM via SCP due to a permissions
# error. [...]; @see:
# error. [...]; @see:
# https://github.com/mitchellh/vagrant/issues/5973#issuecomment-137276605
# https://github.com/mitchellh/vagrant/issues/5973#issuecomment-137276605
# JPT: A
dded
-x python3, so
thi
s actually grab
s existing repo urls.
# JPT: A
lso use "
-x python3
"
, so
repo url
s actually grab
python3 for debian 10
salt
.
bootstrap_options
=
'-F -c /tmp/ -P -x python3'
salt
.
bootstrap_options
=
'-F -c /tmp/ -P -x python3'
salt
.
masterless
=
true
salt
.
masterless
=
true
salt
.
minion_config
=
".saltstack/minion"
salt
.
minion_config
=
".saltstack/minion"
...
@@ -31,6 +33,6 @@ Vagrant.configure(2) do |config|
...
@@ -31,6 +33,6 @@ Vagrant.configure(2) do |config|
salt
.
verbose
=
true
salt
.
verbose
=
true
end
end
#
f
orward some service port from guest to host for testing?!
#
F
orward some service port from guest to host for testing?!
not needed yet
# config.vm.network "forwarded_port", guest:80, host:8888, host_ip:"localhost"
# config.vm.network "forwarded_port", guest:80, host:8888, host_ip:"localhost"
end
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