From 4ba18116ffb1245dafb766b1768f6d5810c9e38d Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Wed, 3 Jun 2020 18:06:05 +0200
Subject: [PATCH] Fix docker-devicemapper playbook

Backport: train

Commit efb8b8bd27d08469c94f103b7314e9905cf6aa0e introduced in Train uses
docker_storage_driver in a Kayobe top-level playbook, but this variable
was only defined in defaults of the docker-devicemapper role. Unless
docker_storage_driver is explicitly set by the operator, the
docker-devicemapper playbook would fail due to the variable being
undefined.

Change-Id: I5e8219d1807b1a4e3ec65f5478eb3f1c7c02b241
Story: 2007719
Task: 39857
---
 ansible/group_vars/all/docker                                | 3 +++
 .../fix-default-docker-storage-driver-e05832be7a4c2ab8.yaml  | 5 +++++
 2 files changed, 8 insertions(+)
 create mode 100644 releasenotes/notes/fix-default-docker-storage-driver-e05832be7a4c2ab8.yaml

diff --git a/ansible/group_vars/all/docker b/ansible/group_vars/all/docker
index 567d4f2e0..d9ab508b3 100644
--- a/ansible/group_vars/all/docker
+++ b/ansible/group_vars/all/docker
@@ -2,6 +2,9 @@
 ###############################################################################
 # Docker configuration.
 
+# Name of the docker storage driver. Default is 'devicemapper'.
+docker_storage_driver: devicemapper
+
 # Name of the docker storage LVM volume group.
 docker_storage_volume_group: data
 
diff --git a/releasenotes/notes/fix-default-docker-storage-driver-e05832be7a4c2ab8.yaml b/releasenotes/notes/fix-default-docker-storage-driver-e05832be7a4c2ab8.yaml
new file mode 100644
index 000000000..af068d741
--- /dev/null
+++ b/releasenotes/notes/fix-default-docker-storage-driver-e05832be7a4c2ab8.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes failure to configure Docker devicemapper storage when the default
+    value of ``docker_storage_driver`` is used.