From: Mandeep Khinda <Mandeep.Khinda@amdocs.com>
Date: Thu, 14 Sep 2017 18:15:24 +0000 (+0000)
Subject: Merge "Containers time zone sync"
X-Git-Tag: 2.0.0-ONAP~654
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=0fe0d89166b7f10f16fa698c2d29a3752a803593;hp=-c;p=oom.git

Merge "Containers time zone sync"
---

0fe0d89166b7f10f16fa698c2d29a3752a803593
diff --combined kubernetes/policy/templates/dep-maria.yaml
index 368d6381c8,57e0eb20c0..e3c93d7fe6
--- a/kubernetes/policy/templates/dep-maria.yaml
+++ b/kubernetes/policy/templates/dep-maria.yaml
@@@ -4,6 -4,7 +4,6 @@@ metadata
    name: mariadb
    namespace: "{{ .Values.nsPrefix }}-policy"
  spec:
 -  replicas: 1
    selector:
      matchLabels:
        app: mariadb
@@@ -14,12 -15,19 +14,15 @@@
      spec:
        hostname: mariadb
        containers:
 -      - command:
 -        - /bin/bash
 -        - -c
 -        - exec bash /tmp/do-start.sh
 -        image: "{{ .Values.image.policyDb }}:{{ .Values.image.policyDbVersion }}"
 +      - image: "{{ .Values.image.policyDb }}:{{ .Values.image.policyDbVersion }}"
          imagePullPolicy: {{ .Values.pullPolicy }}
          name: mariadb
          ports:
          - containerPort: 3306
          volumeMounts:
+         - mountPath: /etc/localtime
+           name: localtime
+           readOnly: true
          - mountPath: /var/lib/mysql
            name: policy-mariadb-data
          readinessProbe:
@@@ -28,6 -36,9 +31,9 @@@
            initialDelaySeconds: 5
            periodSeconds: 10
        volumes:
+       - name: localtime
+         hostPath:
+           path: /etc/localtime
        - name: policy-mariadb-data
          persistentVolumeClaim:
            claimName: policy-db
diff --combined kubernetes/policy/templates/dep-nexus.yaml
index f777d0cabd,84a4433dac..15b7ec38fd
--- a/kubernetes/policy/templates/dep-nexus.yaml
+++ b/kubernetes/policy/templates/dep-nexus.yaml
@@@ -40,8 -40,20 +40,16 @@@ spec
            ]'
      spec:
        containers:
 -      - command:
 -        - /bin/bash
 -        - -c
 -        - bash -c "/opt/nexus/nexus-2.14.2-01/bin/nexus start && sleep 1000d"
 -        image: "{{ .Values.image.policyNexus }}:{{ .Values.image.policyNexusVersion }}"
 +      - image: "{{ .Values.image.policyNexus }}:{{ .Values.image.policyNexusVersion }}"
          imagePullPolicy: {{ .Values.pullPolicy }}
          name: nexus
+         volumeMounts:
+         - name: localtime
+           mountPath: /etc/localtime
+           readOnly: true
+       volumes:
+       - name: localtime
+         hostPath:
+           path: /etc/localtime
        imagePullSecrets:
        - name: "{{ .Values.nsPrefix }}-docker-registry-key"