Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kolla Ansible
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
Very Demiurge Very Mindful
Kolla Ansible
Commits
f043d6ea
Commit
f043d6ea
authored
9 years ago
by
Martin André
Browse files
Options
Downloads
Patches
Plain Diff
Simplify logic of vagrantfile
TrivialFix Change-Id: I0af5d5a80f28d8cb8b5f0e7799fd87bcd73e09cf
parent
0f5c22c1
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dev/vagrant/Vagrantfile
+6
-6
6 additions, 6 deletions
dev/vagrant/Vagrantfile
with
6 additions
and
6 deletions
dev/vagrant/Vagrantfile
+
6
−
6
View file @
f043d6ea
...
...
@@ -166,9 +166,9 @@ Vagrant.configure(2) do |config|
admin
.
vm
.
provider
PROVIDER
do
|
vm
|
vm
.
memory
=
MULTINODE
?
get_setting
(
:operator
,
:memory
)
:
get_setting
(
:aio
,
:memory
)
vm
.
cpus
=
MULTINODE
?
get_setting
(
:operator
,
:cpus
)
:
get_setting
(
:aio
,
:cpus
)
end
admin
.
vm
.
provider
"libvirt"
do
|
vm
|
vm
.
graphics_ip
=
GRAPHICSIP
if
PROVIDER
==
"libvirt"
vm
.
graphics_ip
=
GRAPHICSIP
end
end
admin
.
hostmanager
.
aliases
=
"operator"
end
...
...
@@ -186,9 +186,9 @@ Vagrant.configure(2) do |config|
node
.
vm
.
provider
PROVIDER
do
|
vm
|
vm
.
memory
=
get_setting
(
node_type
.
to_sym
,
:memory
)
vm
.
cpus
=
get_setting
(
node_type
.
to_sym
,
:cpus
)
end
node
.
vm
.
provider
"libvirt"
do
|
vm
|
vm
.
graphics_ip
=
GRAPHICSIP
if
PROVIDER
==
"libvirt"
vm
.
graphics_ip
=
GRAPHICSIP
end
end
node
.
hostmanager
.
aliases
=
hostname
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