From 1a41d6ecd47c910a38fe248620a1d8ce329d53a0 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Thu, 28 Sep 2017 11:43:15 -0400
Subject: [PATCH] Remove references to overlay2 in the code

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
---
 cmd/kpod/main.go                         |  2 +-
 contrib/test/integration/build/cri-o.yml | 10 +++++-----
 contrib/test/integration/test.yml        |  4 ++--
 docs/kpod-inspect.1.md                   |  8 ++++----
 docs/kpod-mount.1.md                     |  6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/cmd/kpod/main.go b/cmd/kpod/main.go
index 2936e49f..804f762a 100644
--- a/cmd/kpod/main.go
+++ b/cmd/kpod/main.go
@@ -98,7 +98,7 @@ func main() {
 		},
 		cli.StringFlag{
 			Name:  "storage-driver, s",
-			Usage: "select which storage driver is used to manage storage of images and containers (default is overlay2)",
+			Usage: "select which storage driver is used to manage storage of images and containers (default is overlay)",
 		},
 		cli.StringSliceFlag{
 			Name:  "storage-opt",
diff --git a/contrib/test/integration/build/cri-o.yml b/contrib/test/integration/build/cri-o.yml
index 8f6cee92..fa025035 100644
--- a/contrib/test/integration/build/cri-o.yml
+++ b/contrib/test/integration/build/cri-o.yml
@@ -47,10 +47,10 @@
     - src: test/redhat_sigstore.yaml
       dest: /etc/containers/registries.d/registry.access.redhat.com.yaml
 
-- name: run with overlay2
+- name: run with overlay
   replace:
     regexp: 'storage_driver = ""'
-    replace: 'storage_driver = "overlay2"'
+    replace: 'storage_driver = "overlay"'
     name: /etc/crio/crio.conf
     backup: yes
 
@@ -69,11 +69,11 @@
     regexp: 'docker\.io'
     state: present
 
-- name: add overlay2 storage opts on RHEL/CentOS
+- name: add overlay storage opts on RHEL/CentOS
   lineinfile:
     dest: /etc/crio/crio.conf
-    line: '"overlay2.override_kernel_check=1"'
+    line: '"overlay.override_kernel_check=1"'
     insertafter: 'storage_option = \['
-    regexp: 'overlay2\.override_kernel_check=1'
+    regexp: 'overlay\.override_kernel_check=1'
     state: present
   when: ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS'
diff --git a/contrib/test/integration/test.yml b/contrib/test/integration/test.yml
index b079cd02..5c58b4c6 100644
--- a/contrib/test/integration/test.yml
+++ b/contrib/test/integration/test.yml
@@ -17,7 +17,7 @@
 
 - name: set extra storage options
   set_fact:
-    extra_storage_opts: " --storage-opt overlay2.override_kernel_check=1"
+    extra_storage_opts: " --storage-opt overlay.override_kernel_check=1"
   when: ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS'
 
 - name: set extra shell for non-xunit tests
@@ -26,7 +26,7 @@
   when: not xunit
 
 - name: run integration tests
-  shell: "CGROUP_MANAGER=cgroupfs STORAGE_OPTS='--storage-driver=overlay2{{ extra_storage_opts | default('') }}' make localintegration{{ extra_shell_suffix }}"
+  shell: "CGROUP_MANAGER=cgroupfs STORAGE_OPTS='--storage-driver=overlay{{ extra_storage_opts | default('') }}' make localintegration{{ extra_shell_suffix }}"
   args:
     chdir: "{{ ansible_env.GOPATH }}/src/github.com/kubernetes-incubator/cri-o"
   ignore_errors: yes
diff --git a/docs/kpod-inspect.1.md b/docs/kpod-inspect.1.md
index 21d41a15..633f1fa4 100644
--- a/docs/kpod-inspect.1.md
+++ b/docs/kpod-inspect.1.md
@@ -146,11 +146,11 @@ kpod inspect redis:alpine
     "Size": 3965955,
     "VirtualSize": 19808086,
     "GraphDriver": {
-        "Name": "overlay2",
+        "Name": "overlay",
         "Data": {
-            "MergedDir": "/var/lib/containers/storage/overlay2/2059d805c90e034cb773d9722232ef018a72143dd31113b470fb876baeccd700/merged",
-            "UpperDir": "/var/lib/containers/storage/overlay2/2059d805c90e034cb773d9722232ef018a72143dd31113b470fb876baeccd700/diff",
-            "WorkDir": "/var/lib/containers/storage/overlay2/2059d805c90e034cb773d9722232ef018a72143dd31113b470fb876baeccd700/work"
+            "MergedDir": "/var/lib/containers/storage/overlay/2059d805c90e034cb773d9722232ef018a72143dd31113b470fb876baeccd700/merged",
+            "UpperDir": "/var/lib/containers/storage/overlay/2059d805c90e034cb773d9722232ef018a72143dd31113b470fb876baeccd700/diff",
+            "WorkDir": "/var/lib/containers/storage/overlay/2059d805c90e034cb773d9722232ef018a72143dd31113b470fb876baeccd700/work"
         }
     },
     "RootFS": {
diff --git a/docs/kpod-mount.1.md b/docs/kpod-mount.1.md
index 599edce6..25ccd937 100644
--- a/docs/kpod-mount.1.md
+++ b/docs/kpod-mount.1.md
@@ -38,13 +38,13 @@ SELinux label for the mount point
 
 kpod mount c831414b10a3
 
-/var/lib/containers/storage/overlay2/f3ac502d97b5681989dff84dfedc8354239bcecbdc2692f9a639f4e080a02364/merged
+/var/lib/containers/storage/overlay/f3ac502d97b5681989dff84dfedc8354239bcecbdc2692f9a639f4e080a02364/merged
 
 kpod mount
 
-c831414b10a3 /var/lib/containers/storage/overlay2/f3ac502d97b5681989dff84dfedc8354239bcecbdc2692f9a639f4e080a02364/merged
+c831414b10a3 /var/lib/containers/storage/overlay/f3ac502d97b5681989dff84dfedc8354239bcecbdc2692f9a639f4e080a02364/merged
 
-a7060253093b /var/lib/containers/storage/overlay2/0ff7d7ca68bed1ace424f9df154d2dd7b5a125c19d887f17653cbcd5b6e30ba1/merged
+a7060253093b /var/lib/containers/storage/overlay/0ff7d7ca68bed1ace424f9df154d2dd7b5a125c19d887f17653cbcd5b6e30ba1/merged
 
 ## SEE ALSO
 kpod(1), kpod-umount(1), mount(8)