diff options
| author |   Mike Elliott <mike.elliott@amdocs.com> | 2017-10-05 18:01:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-10-05 18:01:22 +0000 |
| commit | 756429ad6cd108bff2d81871227e0d6b9080a839 (patch) | |
| tree | 46c45ab663ae8e966f184c8d88912cfdf7d1bd13 | |
| parent | cdabac5a645dc52162835a9ace8c36dcb05db5e1 (diff) | |
| parent | e755f640ec263d81f30a509055714d7b76b329a3 (diff) | |
Merge "Added missing mount to aaf deployment yaml"
| -rw-r--r-- | kubernetes/aaf/templates/aaf-cs-deployment.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/aaf/templates/aaf-deployment.yaml | 7 | ||||
| -rw-r--r-- | kubernetes/config/docker/init/src/config/aaf/data2/identities.dat | 9 |
3 files changed, 18 insertions, 2 deletions
diff --git a/kubernetes/aaf/templates/aaf-cs-deployment.yaml b/kubernetes/aaf/templates/aaf-cs-deployment.yaml index f240150f96..23968f9313 100644 --- a/kubernetes/aaf/templates/aaf-cs-deployment.yaml +++ b/kubernetes/aaf/templates/aaf-cs-deployment.yaml @@ -22,14 +22,14 @@ spec: name: "aaf-cs" volumeMounts: - mountPath: /data - name: aaf-data + name: aaf-cs-data readinessProbe: tcpSocket: port: 7000 initialDelaySeconds: 5 periodSeconds: 10 volumes: - - name: aaf-data + - name: aaf-cs-data hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aaf/data imagePullSecrets: diff --git a/kubernetes/aaf/templates/aaf-deployment.yaml b/kubernetes/aaf/templates/aaf-deployment.yaml index 20e21c4ee8..5950b92c00 100644 --- a/kubernetes/aaf/templates/aaf-deployment.yaml +++ b/kubernetes/aaf/templates/aaf-deployment.yaml @@ -47,11 +47,18 @@ spec: value: cassandra_container image: {{ .Values.image.aafImage }}:{{ .Values.image.aafVersion }} imagePullPolicy: {{ .Values.pullPolicy }} + volumeMounts: + - mountPath: /data + name: aaf-data name: aaf readinessProbe: tcpSocket: port: 8101 initialDelaySeconds: 5 periodSeconds: 10 + volumes: + - name: aaf-data + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aaf/data2 imagePullSecrets: - name: {{ .Values.nsPrefix }}-docker-registry-key diff --git a/kubernetes/config/docker/init/src/config/aaf/data2/identities.dat b/kubernetes/config/docker/init/src/config/aaf/data2/identities.dat new file mode 100644 index 0000000000..95eb51d1be --- /dev/null +++ b/kubernetes/config/docker/init/src/config/aaf/data2/identities.dat @@ -0,0 +1,9 @@ +iowna|Ima D. Owner|Ima|Owner|314-123-2000|ima.d.owner@osaaf.com|e| +mmanager|Mark D. Manager|Mark|Manager|314-123-1234|mark.d.manager@osaaf.com|e|iowna +bdevl|Robert D. Developer|Bob|Developer|314-123-1235|bob.d.develper@osaaf.com|e|mmanager +mmarket|Mary D. Marketer|Mary|Marketer|314-123-1236|mary.d.marketer@osaaf.com|e|mmanager +ccontra|Clarice D. Contractor|Clarice|Contractor|314-123-1237|clarice.d.contractor@osaaf.com|c|mmanager +iretired|Ira Lee M. Retired|Ira|Retired|314-123-1238|clarice.d.contractor@osaaf.com|n|mmanager +osaaf|ID of AAF|||||a|bdevl +m99751|ID of AAF|||||a|bdevl +m99501|ID of AAF|||||a|bdevl |