From d435e176818a5a8fc046a2491cf24705606223a4 Mon Sep 17 00:00:00 2001
From: Wong Hoi Sing Edison <hswong3i@gmail.com>
Date: Tue, 17 Apr 2018 13:41:34 +0800
Subject: [PATCH] cephfs-provisioner: Upgrade to a71a49d4

---
 extra_playbooks/build-cephfs-provisioner.yml | 10 +++++-----
 roles/download/defaults/main.yml             |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/extra_playbooks/build-cephfs-provisioner.yml b/extra_playbooks/build-cephfs-provisioner.yml
index 6a72a076e..267c724ee 100644
--- a/extra_playbooks/build-cephfs-provisioner.yml
+++ b/extra_playbooks/build-cephfs-provisioner.yml
@@ -8,8 +8,8 @@
         version: "{{ item.version }}"
         state: "{{ item.state }}"
       with_items:
-        - { state: "present", name: "docker", version: "2.7.0" }
-        - { state: "present", name: "docker-compose", version: "1.18.0" }
+        - { state: "present", name: "docker", version: "3.2.1" }
+        - { state: "present", name: "docker-compose", version: "1.21.0" }
 
     - name: CephFS Provisioner | Check Go version
       shell: |
@@ -36,18 +36,18 @@
           git:
             repo: https://github.com/kubernetes-incubator/external-storage.git
             dest: "~/go/src/github.com/kubernetes-incubator"
-            version: 92295a30
+            version: a71a49d4
             clone: no
             update: yes
             
         - name: CephFS Provisioner | Build image
           shell: |
             cd ~/go/src/github.com/kubernetes-incubator/external-storage
-            REGISTRY=quay.io/kubespray/ VERSION=92295a30 make ceph/cephfs
+            REGISTRY=quay.io/kubespray/ VERSION=a71a49d4 make ceph/cephfs
 
         - name: CephFS Provisioner | Push image
           docker_image:
-            name: quay.io/kubespray/cephfs-provisioner:92295a30
+            name: quay.io/kubespray/cephfs-provisioner:a71a49d4
             push: yes
           retries: 10
 
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 84f78e404..a7c582d58 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -153,7 +153,7 @@ registry_proxy_image_tag: "0.4"
 local_volume_provisioner_image_repo: "quay.io/external_storage/local-volume-provisioner"
 local_volume_provisioner_image_tag: "v2.0.0"
 cephfs_provisioner_image_repo: "quay.io/kubespray/cephfs-provisioner"
-cephfs_provisioner_image_tag: "92295a30"
+cephfs_provisioner_image_tag: "a71a49d4"
 ingress_nginx_controller_image_repo: "quay.io/kubernetes-ingress-controller/nginx-ingress-controller"
 ingress_nginx_controller_image_tag: "0.12.0"
 ingress_nginx_default_backend_image_repo: "gcr.io/google_containers/defaultbackend"