From 33f33a7358ca59bf4428d0a1605806aadb99b669 Mon Sep 17 00:00:00 2001
From: Lear Li <3250039+lilirui@users.noreply.github.com>
Date: Tue, 6 Nov 2018 17:50:14 -0800
Subject: [PATCH] Fix docker-storage was not found issue (#3584)

---
 .../{docker => }/docker-storage/defaults/main.yml               | 0
 .../docker-storage/files/install_container_storage_setup.sh     | 0
 .../container-engine/{docker => }/docker-storage/tasks/main.yml | 0
 .../docker-storage/templates/docker-storage-setup.j2            | 0
 roles/container-engine/docker/meta/main.yml                     | 2 +-
 5 files changed, 1 insertion(+), 1 deletion(-)
 rename roles/container-engine/{docker => }/docker-storage/defaults/main.yml (100%)
 rename roles/container-engine/{docker => }/docker-storage/files/install_container_storage_setup.sh (100%)
 rename roles/container-engine/{docker => }/docker-storage/tasks/main.yml (100%)
 rename roles/container-engine/{docker => }/docker-storage/templates/docker-storage-setup.j2 (100%)

diff --git a/roles/container-engine/docker/docker-storage/defaults/main.yml b/roles/container-engine/docker-storage/defaults/main.yml
similarity index 100%
rename from roles/container-engine/docker/docker-storage/defaults/main.yml
rename to roles/container-engine/docker-storage/defaults/main.yml
diff --git a/roles/container-engine/docker/docker-storage/files/install_container_storage_setup.sh b/roles/container-engine/docker-storage/files/install_container_storage_setup.sh
similarity index 100%
rename from roles/container-engine/docker/docker-storage/files/install_container_storage_setup.sh
rename to roles/container-engine/docker-storage/files/install_container_storage_setup.sh
diff --git a/roles/container-engine/docker/docker-storage/tasks/main.yml b/roles/container-engine/docker-storage/tasks/main.yml
similarity index 100%
rename from roles/container-engine/docker/docker-storage/tasks/main.yml
rename to roles/container-engine/docker-storage/tasks/main.yml
diff --git a/roles/container-engine/docker/docker-storage/templates/docker-storage-setup.j2 b/roles/container-engine/docker-storage/templates/docker-storage-setup.j2
similarity index 100%
rename from roles/container-engine/docker/docker-storage/templates/docker-storage-setup.j2
rename to roles/container-engine/docker-storage/templates/docker-storage-setup.j2
diff --git a/roles/container-engine/docker/meta/main.yml b/roles/container-engine/docker/meta/main.yml
index d04b24088..55974071c 100644
--- a/roles/container-engine/docker/meta/main.yml
+++ b/roles/container-engine/docker/meta/main.yml
@@ -1,4 +1,4 @@
 ---
 dependencies:
-  - role: container-engine/docker/docker-storage
+  - role: container-engine/docker-storage
     when: docker_container_storage_setup and ansible_os_family == "RedHat"
-- 
GitLab