[incubator-heron] branch master updated: Joshfischer/aws helm fix (#3168)

[nw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

nwang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git


The following commit(s) were added to refs/heads/master by this push:
     new dd6b3d4  Joshfischer/aws helm fix (#3168)
dd6b3d4 is described below

commit dd6b3d49d69cf08fe804c8436ffffb28bc6e8ef9
Author: Josh Fischer <jo...@joshfischer.io>
AuthorDate: Wed Jan 23 21:59:57 2019 -0600

    Joshfischer/aws helm fix (#3168)
    
    * update bookie mount path for aws and baremetal
    
    * clean up
    
    * clean up unused variable
---
 deploy/kubernetes/helm/templates/bookie.yaml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/deploy/kubernetes/helm/templates/bookie.yaml b/deploy/kubernetes/helm/templates/bookie.yaml
index d68cc76..92667d2 100644
--- a/deploy/kubernetes/helm/templates/bookie.yaml
+++ b/deploy/kubernetes/helm/templates/bookie.yaml
@@ -27,7 +27,6 @@
 {{- $bookieDirectMemory := .Values.bookieDirectMemory }}
 {{- $bookieJournalCapacity := .Values.bookieJournalCapacity }}
 {{- $bookieStorageCapacity := .Values.bookieStorageCapacity }}
-{{- $bookieJournalHostPath := .Values.bookieJournalHostPath }}
 {{- $bookieStorageHostPath := .Values.bookieStorageHostPath }}
 
 apiVersion: v1
@@ -144,15 +143,15 @@ spec:
             - name: data-disk
               mountPath: /bookkeeper/data/ledgers
 
-{{- if eq .Values.platform "baremetal" }}
+{{- if or (eq .Values.platform "aws") (eq .Values.platform "baremetal") }}
       volumes:
           # Mount local disks
         - name: journal-disk
           hostPath:
-            path: {{ $bookieJournalHostPath | quote }}
+            path: /bookkeeper/data/journal
         - name: ledgers-disk
           hostPath:
-            path: {{ $bookieStorageHostPath | quote }}
+            path: /bookkeeper/data/ledgers
 {{- end }}
 
 {{- if or (eq .Values.platform "gke") (eq .Values.platform "minikube") }}