Merge pull request #916 from mattymo/update_ansible

Update Ansible to 2.2.1

.gitlab-ci.yml

@@ -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

requirements.txt

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

roles/docker/tasks/main.yml

@@ -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