docker_host: set docker_host on all servers currently using docker

During a recent upgrade of docker it was discovered that we
currently don't have either docker_host or docker_compose_host
set to match machines where docker is actually running.

Let's update the host and group vars to match what is currently
deployed.

Also include a convenience "is_docker_host" that is set if
either 'docker_host' or 'docker_compose_host' is defined for
the server.

Change-Id: Ifb1a187a055f16797c274bd572f4616c2e73fe41
Signed-off-by: Kelley Spoon <kelley.spoon@linaro.org>
Reviewed-on: https://review.linaro.org/c/infrastructure/ansible-playbooks/+/41136

15 files changed, 24 insertions, 3 deletions

diff --git a/group_vars/all b/group_vars/all
index b7dea1ba..10ac0198 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -35,3 +35,6 @@ admin_user: ubuntu
 prometheus_scrapers:
   - elk.linaro.org
   - grafana.linaro.org
+
+# convenience var to see if either docker_compose_host or docker_host set for this server
+is_docker_host: "{{ (docker_host is defined and docker_host is true) or (docker_compose_host is defined and docker_compose_host is true) }}"
diff --git a/group_vars/git b/group_vars/git
index cc50dcf7..ba4ff5f6 100644
--- a/group_vars/git
+++ b/group_vars/git
@@ -3,6 +3,7 @@ host_site_name: Linaro Git Hosting
 host_site_desc: Git repositories hosted by Linaro
 has_gerrit: true
 repo_root: "{{install_base}}/repositories"
+docker_compose_host: true
 
 login_groups:
   - systems
diff --git a/group_vars/gitlab b/group_vars/gitlab
new file mode 100644
index 00000000..f90ac172
--- /dev/null
+++ b/group_vars/gitlab
@@ -0,0 +1,2 @@
+---
+docker_host: true
diff --git a/group_vars/gitlab_runner b/group_vars/gitlab_runner
new file mode 100644
index 00000000..f90ac172
--- /dev/null
+++ b/group_vars/gitlab_runner
@@ -0,0 +1,2 @@
+---
+docker_host: true
diff --git a/group_vars/grafana b/group_vars/grafana
index 01c7c1f1..8fc30f18 100644
--- a/group_vars/grafana
+++ b/group_vars/grafana
@@ -2,3 +2,5 @@
 grafana_image_name: grafana/grafana
 grafana_container_name: grafana
 grafana_port: 3000
+
+docker_compose_host: true
diff --git a/group_vars/jenkins_master b/group_vars/jenkins_master
index e8a2e8ef..65a90d90 100644
--- a/group_vars/jenkins_master
+++ b/group_vars/jenkins_master
@@ -29,7 +29,7 @@ ufw_open_ports:
   - 50000
 
 # Docker
-docker_host: yes
+docker_host: true
 
 jenkins_master_image: 'linaro/ci-x86_64-jenkins-master-debian:lts'
 jenkins_master_container_name: 'jenkins'
diff --git a/group_vars/jenkins_slaves_hetzner_oe b/group_vars/jenkins_slaves_hetzner_oe
index 3d2b652a..1d270553 100644
--- a/group_vars/jenkins_slaves_hetzner_oe
+++ b/group_vars/jenkins_slaves_hetzner_oe
@@ -4,3 +4,4 @@ nfs_client_mount:
     fstype: nfs
     opts: rw,noatime,vers=4.2,hard,intr
     state: mounted
+docker_host: true
diff --git a/group_vars/jenkins_slaves_online b/group_vars/jenkins_slaves_online
new file mode 100644
index 00000000..f90ac172
--- /dev/null
+++ b/group_vars/jenkins_slaves_online
@@ -0,0 +1,2 @@
+---
+docker_host: true
diff --git a/group_vars/jenkins_slaves_simple b/group_vars/jenkins_slaves_simple
index ce73c756..49187be8 100644
--- a/group_vars/jenkins_slaves_simple
+++ b/group_vars/jenkins_slaves_simple
@@ -1,6 +1,8 @@
 docker_group_user:
   - ci-admin
 
+docker_compose_host: true
+
 docker_engine_opts:
   - "-H tcp://0.0.0.0:2375"
   - "-H unix:///var/run/docker.sock"
diff --git a/host_vars/elk.linaro.org b/host_vars/elk.linaro.org
index caa36479..730c9d42 100644
--- a/host_vars/elk.linaro.org
+++ b/host_vars/elk.linaro.org
@@ -31,7 +31,7 @@ ufw_open_ports:
   - 80
   - 443
 
-docker_host: yes
+docker_compose_host: true
 
 # would be ideal to get this from the running config
 postfix_networks: 172.17.0.0/16
diff --git a/host_vars/flexnet.trustedfirmware.org b/host_vars/flexnet.trustedfirmware.org
index c4e9df0c..ec3d2a4b 100644
--- a/host_vars/flexnet.trustedfirmware.org
+++ b/host_vars/flexnet.trustedfirmware.org
@@ -9,6 +9,8 @@ sudo_groups:
   - systems
   - trustedfirmware-infrastructure
 
+docker_host: true
+
 flexnet_access:
  - 51.159.20.54
  - 51.159.1.37
diff --git a/host_vars/lava.morello-project.org b/host_vars/lava.morello-project.org
index b742f215..7f837c9f 100644
--- a/host_vars/lava.morello-project.org
+++ b/host_vars/lava.morello-project.org
@@ -1,6 +1,8 @@
 ---
 ansible_python_interpreter: /usr/bin/python3
 
+docker_host: true
+
 login_groups:
   - systems
   - morello-infrastructure
diff --git a/host_vars/x86-TF-01 b/host_vars/x86-TF-01
index 5f2dd800..0c171bd1 100644
--- a/host_vars/x86-TF-01
+++ b/host_vars/x86-TF-01
@@ -11,6 +11,7 @@ sudo_groups:
   - trustedfirmware-infrastructure
 
 jenkins_ip: 51.159.57.81 #ci.trustedfirmware.org
+docker_host: true
 
 nfs_client_mount:
   - path: /srv/shared
diff --git a/host_vars/x86-TF-02 b/host_vars/x86-TF-02
index a849f52a..4bfe2553 100644
--- a/host_vars/x86-TF-02
+++ b/host_vars/x86-TF-02
@@ -14,6 +14,7 @@ sudo_groups:
 jenkins_staging_ip: 34.229.64.237 #ci.staging.trustedfirmware.org
 jenkins_ip: 51.159.57.81 #ci.trustedfirmware.org
 
+docker_host: true
 nfs_client_group: "jenkins_slaves_online_tf"
 
 nfs_exports:
diff --git a/roles/atom/meta/main.yml b/roles/atom/meta/main.yml
index aa01227d..affa62e3 100644
--- a/roles/atom/meta/main.yml
+++ b/roles/atom/meta/main.yml
@@ -5,7 +5,7 @@ dependencies:
     - {role: ssh-admin, tags: [ssh-admin], when: admin_user is defined}
     - {role: linaro-git-tools, tags: [lgt]}
     - {role: ssh-ldap, tags: [ssh-ldap], when: no_ldap is undefined}
-    - {role: docker-deps, tags: [docker], when: docker_host is defined}
+    - {role: docker-deps, tags: [docker], when: is_docker_host is True}
     - {role: docker-compose-deps, tags: [docker,docker-compose], when: docker_compose_host is defined}
       #    - {role: filebeat, tags: [filebeat]}
     - {role: metricbeat, tags: [metricbeat]}