C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update Ansible to 2.2.1

Browse source
This commit is contained in:
Matthew Mosesohn 2017-01-18 17:48:21 +03:00
parent 5420fa942e
commit 8a821060a3
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -17,7 +17,7 @@ variables:
# us-west1-a # us-west1-a
before_script: before_script:
- pip install ansible - pip install ansible==2.2.1.0
- pip install netaddr - pip install netaddr
- pip install apache-libcloud==0.20.1 - pip install apache-libcloud==0.20.1
- pip install boto==2.9.0 - pip install boto==2.9.0
@ -66,7 +66,7 @@ before_script:
stage: deploy-gce stage: deploy-gce
before_script: before_script:
- docker info - docker info
- pip install ansible==2.1.3.0 - pip install ansible==2.2.1.0
- pip install netaddr - pip install netaddr
- pip install apache-libcloud==0.20.1 - pip install apache-libcloud==0.20.1
- pip install boto==2.9.0 - pip install boto==2.9.0

2
requirements.txt
View file

@ -1,2 +1,2 @@
ansible ansible>=2.2.1
netaddr netaddr

2
roles/docker/tasks/main.yml
View file

@ -69,7 +69,7 @@
when: (not ansible_os_family in ["CoreOS", "Container Linux by CoreOS"]) and (docker_package_info.pkgs|length > 0) 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 - 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 register: docker_version
failed_when: docker_version.stdout|version_compare('1.12', '<') failed_when: docker_version.stdout|version_compare('1.12', '<')
changed_when: false changed_when: false