diff options
| author |   Jerome Doucerain <jerome.doucerain@bell.ca> | 2018-03-17 14:18:41 -0400 |
|---|---|---|
| committer | Jerome Doucerain <jerome.doucerain@bell.ca> | 2018-03-17 14:18:41 -0400 |
| commit | 9e5c75760a9ac237fcd02aeb6a7684873c35d794 (patch) | |
| tree | 6a11371fb1bb845dc081570be6e52f9ad17c9e72 /templates | |
| parent | 0e58a663a77ad4fce6dbcec855cdc7978f1e855f (diff) | |
AAI parameterization
added parameter for the AAI_CORE version
added parameterized persisted storage location
Issue-ID: OOM-734
Change-Id: Iefe3d89ae6d001754251e0f5ce2735c9a920bcd5
Signed-off-by: Jerome Doucerain <jerome.doucerain@bell.ca>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/aai-resources-deployment.yaml | 3 | ||||
| -rw-r--r-- | templates/aai-traversal-deployment.yaml | 3 | ||||
| -rw-r--r-- | templates/data-router-deployment.yaml | 3 | ||||
| -rw-r--r-- | templates/elasticsearch-deployment.yaml | 3 | ||||
| -rw-r--r-- | templates/hbase-deployment.yaml | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/templates/aai-resources-deployment.yaml b/templates/aai-resources-deployment.yaml index cd4412d..332b890 100644 --- a/templates/aai-resources-deployment.yaml +++ b/templates/aai-resources-deployment.yaml @@ -435,7 +435,7 @@ spec: - name: AAI_CHEF_ENV value: simpledemo - name: AAI_CORE_VERSION - value: 1.1.0-SNAPSHOT + value: {{ .Values.aaicoreversion }} - name: AAI_CHEF_LOC value: /var/chef/aai-data/environments - name: CHEF_GIT_URL @@ -498,3 +498,4 @@ spec: imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} + diff --git a/templates/aai-traversal-deployment.yaml b/templates/aai-traversal-deployment.yaml index 2445e1e..f039d0f 100644 --- a/templates/aai-traversal-deployment.yaml +++ b/templates/aai-traversal-deployment.yaml @@ -267,7 +267,7 @@ spec: - name: AAI_CHEF_ENV value: simpledemo - name: AAI_CORE_VERSION - value: 1.1.0-SNAPSHOT + value: {{ .Values.aaicoreversion }} - name: AAI_CHEF_LOC value: /var/chef/aai-data/environments - name: CHEF_GIT_URL @@ -330,3 +330,4 @@ spec: imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} + diff --git a/templates/data-router-deployment.yaml b/templates/data-router-deployment.yaml index 37b9fb4..b1cb834 100644 --- a/templates/data-router-deployment.yaml +++ b/templates/data-router-deployment.yaml @@ -136,8 +136,9 @@ spec: name: aai-data-router-dynamic-configmap - name: aai-data-router-logs hostPath: - path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/data-router/logs" + path: {{ .Values.persistence.mountPath }}/{{ .Release.Name }}/aai/data-router/logs restartPolicy: Always imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} + diff --git a/templates/elasticsearch-deployment.yaml b/templates/elasticsearch-deployment.yaml index 902f31e..a07db04 100644 --- a/templates/elasticsearch-deployment.yaml +++ b/templates/elasticsearch-deployment.yaml @@ -81,7 +81,8 @@ spec: name: aai-elasticsearch-configmap - name: elasticsearch-data hostPath: - path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/elasticsearch/data" + path: {{ .Values.persistence.mountPath }}/{{ .Release.Name }}/aai/elasticsearch/data imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} + diff --git a/templates/hbase-deployment.yaml b/templates/hbase-deployment.yaml index 08c2ee3..62b017d 100644 --- a/templates/hbase-deployment.yaml +++ b/templates/hbase-deployment.yaml @@ -56,10 +56,11 @@ spec: volumes: - name: hbase-data hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/hbase + path: {{ .Values.persistence.mountPath }}/{{ .Release.Name }}/aai/hbase - name: localtime hostPath: path: /etc/localtime imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} + |