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
b492a623
Commit
b492a623
authored
5 years ago
by
Zuul
Committed by
Gerrit Code Review
5 years ago
Browse files
Options
Downloads
Plain Diff
Merge "Fix kolla-bootstrap-servers with docker_storage_driver set"
parents
d55dac92
12987ca0
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
ansible/roles/baremetal/tasks/post-install.yml
+5
-5
5 additions, 5 deletions
ansible/roles/baremetal/tasks/post-install.yml
with
5 additions
and
5 deletions
ansible/roles/baremetal/tasks/post-install.yml
+
5
−
5
View file @
b492a623
...
@@ -71,7 +71,7 @@
...
@@ -71,7 +71,7 @@
debug
:
debug
:
msg
:
>
msg
:
>
docker_custom_option is deprecated in favor of docker_custom_config
docker_custom_option is deprecated in favor of docker_custom_config
when
:
docker_custom_option
when
:
docker_custom_option
| length >
0
-
name
:
Setup docker insecure registries
-
name
:
Setup docker insecure registries
vars
:
vars
:
...
@@ -83,12 +83,12 @@
...
@@ -83,12 +83,12 @@
-
name
:
Setup docker storage driver
-
name
:
Setup docker storage driver
set_fact
:
set_fact
:
docker_config
:
"
{{
docker_config
|
combine({'storage-driver':
docker_storage_driver})
}}"
docker_config
:
"
{{
docker_config
|
combine({'storage-driver':
docker_storage_driver})
}}"
when
:
docker_storage_driver
when
:
docker_storage_driver
| length >
0
-
name
:
Setup docker runtime directory
-
name
:
Setup docker runtime directory
set_fact
:
set_fact
:
docker_config
:
"
{{
docker_config
|
combine({'data-root':
docker_runtime_directory})
}}"
docker_config
:
"
{{
docker_config
|
combine({'data-root':
docker_runtime_directory})
}}"
when
:
docker_runtime_directory
when
:
docker_runtime_directory
| length >
0
-
name
:
Merge custom docker config
-
name
:
Merge custom docker config
set_fact
:
set_fact
:
...
@@ -117,14 +117,14 @@
...
@@ -117,14 +117,14 @@
path
:
/etc/systemd/system/docker.service.d
path
:
/etc/systemd/system/docker.service.d
state
:
directory
state
:
directory
recurse
:
yes
recurse
:
yes
when
:
docker_custom_option or docker_configure_for_zun|bool
when
:
docker_custom_option
| length > 0
or docker_configure_for_zun|bool
-
name
:
Configure docker service
-
name
:
Configure docker service
become
:
True
become
:
True
template
:
template
:
src
:
docker_systemd_service.j2
src
:
docker_systemd_service.j2
dest
:
/etc/systemd/system/docker.service.d/kolla.conf
dest
:
/etc/systemd/system/docker.service.d/kolla.conf
when
:
docker_custom_option or docker_configure_for_zun|bool
when
:
docker_custom_option
| length > 0
or docker_configure_for_zun|bool
-
name
:
Reload docker service file
-
name
:
Reload docker service file
become
:
True
become
:
True
...
...
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