From 48eda02b3d92cbc93f2e0fcc1cd0c1caed0dff5f Mon Sep 17 00:00:00 2001
From: Will Miller <willm@stackhpc.com>
Date: Mon, 6 Aug 2018 11:05:18 +0000
Subject: [PATCH] Use overlay Docker storage for seed CI

Bifrost is now able to support the overlay Docker storage driver.
Switch to using it instead of devicemapper with a logical volume mounted
on a loopback device.
---
 etc/kayobe/docker.yml                            | 3 +--
 etc/kayobe/inventory/group_vars/overcloud/docker | 3 ---
 etc/kayobe/inventory/group_vars/seed/docker      | 7 -------
 etc/kayobe/seed.yml                              | 4 +++-
 4 files changed, 4 insertions(+), 13 deletions(-)
 delete mode 100644 etc/kayobe/inventory/group_vars/overcloud/docker
 delete mode 100644 etc/kayobe/inventory/group_vars/seed/docker

diff --git a/etc/kayobe/docker.yml b/etc/kayobe/docker.yml
index bc3be1b..9b48b30 100644
--- a/etc/kayobe/docker.yml
+++ b/etc/kayobe/docker.yml
@@ -4,8 +4,7 @@
 
 # Name of the docker storage driver. Supported values include 'devicemapper'
 # and 'overlay'.
-# NOTE: This is configured in group_vars for the seed and overcloud groups.
-#docker_storage_driver:
+docker_storage_driver: overlay
 
 # Name of the docker storage LVM volume group.
 #docker_storage_volume_group:
diff --git a/etc/kayobe/inventory/group_vars/overcloud/docker b/etc/kayobe/inventory/group_vars/overcloud/docker
deleted file mode 100644
index e37c82e..0000000
--- a/etc/kayobe/inventory/group_vars/overcloud/docker
+++ /dev/null
@@ -1,3 +0,0 @@
----
-# Use the overlay docker storage driver as it doesn't require LVM.
-docker_storage_driver: overlay
diff --git a/etc/kayobe/inventory/group_vars/seed/docker b/etc/kayobe/inventory/group_vars/seed/docker
deleted file mode 100644
index d0677b8..0000000
--- a/etc/kayobe/inventory/group_vars/seed/docker
+++ /dev/null
@@ -1,7 +0,0 @@
----
-# Don't use the overlay driver as it doesn't work with the ansible template
-# module until ansible 2.4.0.
-docker_storage_driver: devicemapper
-
-# Size of the docker storage data LVM volume (see lvol module size argument).
-docker_storage_volume_thinpool_size: 45%VG
diff --git a/etc/kayobe/seed.yml b/etc/kayobe/seed.yml
index 2c030d0..66ee012 100644
--- a/etc/kayobe/seed.yml
+++ b/etc/kayobe/seed.yml
@@ -23,7 +23,9 @@
 
 # List of seed volume groups. See mrlesmithjr.manage-lvm role for
 # format.
-#seed_lvm_groups:
+# NOTE: We set this to an empty list here because the default Docker storage
+# driver (overlay) does not require any LVM groups.
+seed_lvm_groups: []
 
 # Default list of seed volume groups. See mrlesmithjr.manage-lvm role for
 # format.