Merge pull request #3955 from edx/feanil/update_docker_tools

Changes needed to install docker on tools-jenkins.

playbooks/roles/docker-tools/defaults/main.yml

@@ -5,9 +5,10 @@ docker_tools_deps_deb_pkgs:
     - ca-certificates
     - python-pip
 
-docker_apt_keyserver: "hkp://ha.pool.sks-keyservers.net:80"
-docker_apt_key_id: "58118E89F3A912897C070ADBF76221572C52609D"
-docker_repo: "deb https://apt.dockerproject.org/repo ubuntu-xenial main"
+docker_apt_key_url: "https://download.docker.com/linux/ubuntu/gpg"
+docker_repos:
+    - "deb [arch=amd64] https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable"
+    - "deb [arch=amd64] https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} edge"
 
 docker_group: "docker"
 docker_users: []

playbooks/roles/docker-tools/tasks/main.yml

@@ -29,24 +29,23 @@
 
 - name: add docker apt key
   apt_key:
-    keyserver: "{{ docker_apt_keyserver }}"
-    id: "{{ docker_apt_key_id }}"
+    url: "{{ docker_apt_key_url }}"
   tags:
     - install
     - install:configuration
 
 - name: add docker repo
   apt_repository:
-    repo: "{{ docker_repo }}"
+    repo: "{{ item }}"
+  with_items: "{{ docker_repos }}"
   tags:
     - install
     - install:configuration
 
 - name: install docker-engine
   apt:
-    name: "docker-engine"
+    name: "docker-ce"
     update_cache: yes
-    cache_valid_time: "{{ cache_valid_time }}"
   tags:
     - install
     - install:system-requirements

playbooks/roles/user/tasks/main.yml

@@ -126,7 +126,7 @@
     url: "https://github.com/{{ item.name }}.keys"
     return_content: true
   # We don't care if absent users lack ssh keys
-  when: item.get('state', 'present') == 'present'
+  when: item.get('state', 'present') == 'present' and item.github is defined
   with_items: "{{ user_info }}"
   register: github_users_return