Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
2c902084
Commit
2c902084
authored
6 years ago
by
ant31
Browse files
Options
Downloads
Patches
Plain Diff
Fix docker apt-repo for Ubuntu18
parent
32049efb
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
roles/docker/tasks/main.yml
+19
-2
19 additions, 2 deletions
roles/docker/tasks/main.yml
roles/docker/vars/ubuntu-bionic.yml
+31
-0
31 additions, 0 deletions
roles/docker/vars/ubuntu-bionic.yml
with
50 additions
and
2 deletions
roles/docker/tasks/main.yml
+
19
−
2
View file @
2c902084
...
@@ -73,7 +73,9 @@
...
@@ -73,7 +73,9 @@
retries
:
4
retries
:
4
delay
:
"
{{
retry_stagger
|
random
+
3
}}"
delay
:
"
{{
retry_stagger
|
random
+
3
}}"
with_items
:
"
{{
dockerproject_repo_key_info.repo_keys
}}"
with_items
:
"
{{
dockerproject_repo_key_info.repo_keys
}}"
when
:
not (ansible_os_family in ["CoreOS", "Container Linux by CoreOS", "RedHat", "Suse"] or is_atomic)
when
:
-
not (ansible_os_family in ["CoreOS", "Container Linux by CoreOS", "RedHat", "Suse"] or is_atomic)
-
use_docker_engine is defined and use_docker_engine
-
name
:
ensure docker-engine repository is enabled
-
name
:
ensure docker-engine repository is enabled
action
:
"
{{
dockerproject_repo_info.pkg_repo
}}"
action
:
"
{{
dockerproject_repo_info.pkg_repo
}}"
...
@@ -81,7 +83,9 @@
...
@@ -81,7 +83,9 @@
repo
:
"
{{item}}"
repo
:
"
{{item}}"
state
:
present
state
:
present
with_items
:
"
{{
dockerproject_repo_info.repos
}}"
with_items
:
"
{{
dockerproject_repo_info.repos
}}"
when
:
not (ansible_os_family in ["CoreOS", "Container Linux by CoreOS", "RedHat", "Suse"] or is_atomic) and (dockerproject_repo_info.repos|length > 0)
when
:
-
use_docker_engine is defined and use_docker_engine
-
not (ansible_os_family in ["CoreOS", "Container Linux by CoreOS", "RedHat", "Suse"] or is_atomic) and (dockerproject_repo_info.repos|length > 0)
-
name
:
Configure docker repository on RedHat/CentOS
-
name
:
Configure docker repository on RedHat/CentOS
template
:
template
:
...
@@ -104,6 +108,7 @@
...
@@ -104,6 +108,7 @@
line
:
'
obsoletes=0'
line
:
'
obsoletes=0'
when
:
ansible_distribution in ["CentOS","RedHat"] and not is_atomic
when
:
ansible_distribution in ["CentOS","RedHat"] and not is_atomic
-
name
:
ensure docker packages are installed
-
name
:
ensure docker packages are installed
action
:
"
{{
docker_package_info.pkg_mgr
}}"
action
:
"
{{
docker_package_info.pkg_mgr
}}"
args
:
args
:
...
@@ -111,6 +116,7 @@
...
@@ -111,6 +116,7 @@
force
:
"
{{item.force|default(omit)}}"
force
:
"
{{item.force|default(omit)}}"
conf_file
:
"
{{item.yum_conf|default(omit)}}"
conf_file
:
"
{{item.yum_conf|default(omit)}}"
state
:
present
state
:
present
update_cache
:
yes
register
:
docker_task_result
register
:
docker_task_result
until
:
docker_task_result|succeeded
until
:
docker_task_result|succeeded
retries
:
4
retries
:
4
...
@@ -118,6 +124,17 @@
...
@@ -118,6 +124,17 @@
with_items
:
"
{{
docker_package_info.pkgs
}}"
with_items
:
"
{{
docker_package_info.pkgs
}}"
notify
:
restart docker
notify
:
restart docker
when
:
not (ansible_os_family in ["CoreOS", "Container Linux by CoreOS"] or is_atomic) and (docker_package_info.pkgs|length > 0)
when
:
not (ansible_os_family in ["CoreOS", "Container Linux by CoreOS"] or is_atomic) and (docker_package_info.pkgs|length > 0)
ignore_errors
:
true
-
name
:
get available packages on Ubuntu
command
:
apt-cache policy docker-ce
when
:
docker_task_result|failed
register
:
available_packages
-
name
:
show available packages on ubuntu
fail
:
msg
:
"
{{available_packages}}"
when
:
docker_task_result|failed
-
name
:
ensure service is started if docker packages are already present
-
name
:
ensure service is started if docker packages are already present
service
:
service
:
...
...
This diff is collapsed.
Click to expand it.
roles/docker/vars/ubuntu-bionic.yml
0 → 100644
+
31
−
0
View file @
2c902084
---
docker_kernel_min_version
:
'
3.10'
docker_version
:
18.06
use_docker_engine
:
false
docker_versioned_pkg
:
'
latest'
:
docker-ce
'18.03'
:
docker-ce=18.03.1~ce-3-0~ubuntu
'18.06'
:
docker-ce=18.06.1~ce~3-0~ubuntu
'stable'
:
docker-ce=18.06.1~ce~3-0~ubuntu
'edge'
:
docker-ce=18.06.1~ce~3-0~ubuntu
docker_package_info
:
pkg_mgr
:
apt
pkgs
:
-
name
:
"
{{
docker_versioned_pkg[docker_version
|
string]
}}"
force
:
yes
docker_repo_key_info
:
pkg_key
:
apt_key
url
:
'
{{
docker_ubuntu_repo_gpgkey
}}'
repo_keys
:
-
9DC858229FC7DD38854AE2D88D81803C0EBFCD88
docker_repo_info
:
pkg_repo
:
apt_repository
repos
:
-
>
deb {{ docker_ubuntu_repo_base_url }}
{{ ansible_distribution_release|lower }}
stable
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