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
8a821060
Commit
8a821060
authored
8 years ago
by
Matthew Mosesohn
Browse files
Options
Downloads
Patches
Plain Diff
Update Ansible to 2.2.1
parent
5420fa94
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+2
-2
2 additions, 2 deletions
.gitlab-ci.yml
requirements.txt
+1
-1
1 addition, 1 deletion
requirements.txt
roles/docker/tasks/main.yml
+1
-1
1 addition, 1 deletion
roles/docker/tasks/main.yml
with
4 additions
and
4 deletions
.gitlab-ci.yml
+
2
−
2
View file @
8a821060
...
...
@@ -17,7 +17,7 @@ variables:
# us-west1-a
before_script
:
-
pip install ansible
-
pip install ansible
==2.2.1.0
-
pip install netaddr
-
pip install apache-libcloud==0.20.1
-
pip install boto==2.9.0
...
...
@@ -66,7 +66,7 @@ before_script:
stage
:
deploy-gce
before_script
:
-
docker info
-
pip install ansible==2.
1.3
.0
-
pip install ansible==2.
2.1
.0
-
pip install netaddr
-
pip install apache-libcloud==0.20.1
-
pip install boto==2.9.0
...
...
This diff is collapsed.
Click to expand it.
requirements.txt
+
1
−
1
View file @
8a821060
ansible
ansible
>=2.2.1
netaddr
This diff is collapsed.
Click to expand it.
roles/docker/tasks/main.yml
+
1
−
1
View file @
8a821060
...
...
@@ -69,7 +69,7 @@
when
:
(not ansible_os_family in ["CoreOS", "Container Linux by CoreOS"]) and (docker_package_info.pkgs|length > 0)
-
name
:
check minimum docker version for docker_dns mode. You need at least docker version >= 1.12 for resolvconf_mode=docker_dns
shell
:
docker version -f "{{ '{{' }}.Client.Version{{ '}}' }}"
raw
:
docker version -f "{{ '{{' }}.Client.Version{{ '}}' }}"
register
:
docker_version
failed_when
:
docker_version.stdout|version_compare('1.12', '<')
changed_when
:
false
...
...
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