Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Docker Machine
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
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SmartDataLab
public
applications
Docker Machine
Commits
dfdca212
Commit
dfdca212
authored
Aug 16, 2018
by
Robert Rettig
Committed by
Joffrey F
Sep 19, 2018
Browse files
Options
Downloads
Patches
Plain Diff
change default storage driver for redhat
Signed-off-by:
Robert Rettig
<
robert.rettig@ndgit.com
>
parent
19035310
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
libmachine/provision/redhat.go
+1
-1
1 addition, 1 deletion
libmachine/provision/redhat.go
libmachine/provision/redhat_test.go
+2
-2
2 additions, 2 deletions
libmachine/provision/redhat_test.go
with
3 additions
and
3 deletions
libmachine/provision/redhat.go
+
1
−
1
View file @
dfdca212
...
@@ -134,7 +134,7 @@ func (provisioner *RedHatProvisioner) Provision(swarmOptions swarm.Options, auth
...
@@ -134,7 +134,7 @@ func (provisioner *RedHatProvisioner) Provision(swarmOptions swarm.Options, auth
swarmOptions
.
Env
=
engineOptions
.
Env
swarmOptions
.
Env
=
engineOptions
.
Env
// set default storage driver for redhat
// set default storage driver for redhat
storageDriver
,
err
:=
decideStorageDriver
(
provisioner
,
"
devicemapper
"
,
engineOptions
.
StorageDriver
)
storageDriver
,
err
:=
decideStorageDriver
(
provisioner
,
"
overlay2
"
,
engineOptions
.
StorageDriver
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
...
...
This diff is collapsed.
Click to expand it.
libmachine/provision/redhat_test.go
+
2
−
2
View file @
dfdca212
...
@@ -14,7 +14,7 @@ func TestRedHatDefaultStorageDriver(t *testing.T) {
...
@@ -14,7 +14,7 @@ func TestRedHatDefaultStorageDriver(t *testing.T) {
p
:=
NewRedHatProvisioner
(
""
,
&
fakedriver
.
Driver
{})
p
:=
NewRedHatProvisioner
(
""
,
&
fakedriver
.
Driver
{})
p
.
SSHCommander
=
provisiontest
.
NewFakeSSHCommander
(
provisiontest
.
FakeSSHCommanderOptions
{})
p
.
SSHCommander
=
provisiontest
.
NewFakeSSHCommander
(
provisiontest
.
FakeSSHCommanderOptions
{})
p
.
Provision
(
swarm
.
Options
{},
auth
.
Options
{},
engine
.
Options
{})
p
.
Provision
(
swarm
.
Options
{},
auth
.
Options
{},
engine
.
Options
{})
if
p
.
EngineOptions
.
StorageDriver
!=
"
devicemapper
"
{
if
p
.
EngineOptions
.
StorageDriver
!=
"
overlay2
"
{
t
.
Fatal
(
"Default storage driver should be
devicemapper
"
)
t
.
Fatal
(
"Default storage driver should be
overlay2
"
)
}
}
}
}
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