Merge "install-docker: option to install docker-compose"

roles/install-docker/README.rst

@@ -18,6 +18,12 @@ An ansible role to install docker and configure it to use mirrors if available.
    By default this role adds repositories to install docker from upstream
    docker. Set this to False to use the docker that comes with the distro.
 
+.. zuul:rolevar:: docker_compose_install
+   :default: False
+
+   This role does not install docker-compose by default but you can use
+   this setting to install docker-compose as well.
+
 .. zuul:rolevar:: docker_update_channel
    :default: stable
 

roles/install-docker/defaults/main.yaml

@@ -4,6 +4,7 @@ docker_group: docker
 #                  The default option will return an empty list which
 #                  allows folks to override these lists as they see fit.
 docker_distro_packages: "{{ _docker_distro_packages | default([]) }}"
+docker_compose_install: false
 docker_upstream_distro_packages: "{{ _docker_upstream_distro_packages | default([]) }}"
 docker_upstream_distro_required_packages: "{{ _docker_upstream_distro_required_packages | default([]) }}"
 docker_update_channel: stable

roles/install-docker/tasks/main.yaml

@@ -57,6 +57,13 @@
 
 - include_tasks: "docker-{{ (use_upstream_docker | bool) | ternary('upstream', 'distro') }}.yaml"
 
+- name: Install docker-compose
+  become: true
+  package:
+    name: docker-compose
+    state: present
+  when: docker_compose_install | bool
+
 - name: Flush handlers before role exit
   meta: flush_handlers