From e94258e3be0da3a15680de53b1817490c4173759 Mon Sep 17 00:00:00 2001 From: Munir Ahmad Date: Thu, 17 Aug 2017 12:04:14 -0400 Subject: Revert 0b1332938385cc534b1f034b73f19c145ead87c6 Issue-ID: OOM-66 This reverts commit 0b1332938385cc534b1f034b73f19c145ead87c6. Change-Id: I05ba7dd5050ee2ef03cf19d1c5c0db03e12a0d4f Signed-off-by: Munir Ahmad --- kubernetes/sdc/sdc-be.yaml | 10 +++++----- kubernetes/sdc/sdc-cs.yaml | 8 ++++---- kubernetes/sdc/sdc-es.yaml | 8 ++++---- kubernetes/sdc/sdc-fe.yaml | 12 ++++++------ kubernetes/sdc/sdc-kb.yaml | 6 +++--- 5 files changed, 22 insertions(+), 22 deletions(-) (limited to 'kubernetes/sdc') diff --git a/kubernetes/sdc/sdc-be.yaml b/kubernetes/sdc/sdc-be.yaml index aa27f67d2a..f23db779ab 100644 --- a/kubernetes/sdc/sdc-be.yaml +++ b/kubernetes/sdc/sdc-be.yaml @@ -70,7 +70,7 @@ spec: valueFrom: fieldRef: fieldPath: status.podIP - image: nexus3.onap.org:10001/openecomp/sdc-backend:1.1-STAGING-latest + image: nexus3.onap.org:10001/openecomp/sdc-backend:1.0-STAGING-latest name: sdc-be volumeMounts: - mountPath: /usr/share/elasticsearch/data/ @@ -94,18 +94,18 @@ spec: volumes: - name: sdc-sdc-es-es hostPath: - path: /dockerdata/onapdemo/sdc/sdc-es/ES + path: /dockerdata-nfs/onapdemo/sdc/sdc-es/ES - name: sdc-environments hostPath: - path: /dockerdata/onapdemo/sdc/environments + path: /dockerdata-nfs/onapdemo/sdc/environments - name: sdc-jetty-keystore hostPath: - path: /dockerdata/onapdemo/sdc/jetty/keystore + path: /dockerdata-nfs/onapdemo/sdc/jetty/keystore - name: sdc-localtime hostPath: path: /etc/localtime - name: sdc-logs hostPath: - path: /dockerdata/onapdemo/sdc/logs + path: /dockerdata-nfs/onapdemo/sdc/logs imagePullSecrets: - name: onap-docker-registry-key diff --git a/kubernetes/sdc/sdc-cs.yaml b/kubernetes/sdc/sdc-cs.yaml index 51a33937d7..74874f9c35 100644 --- a/kubernetes/sdc/sdc-cs.yaml +++ b/kubernetes/sdc/sdc-cs.yaml @@ -50,7 +50,7 @@ spec: fieldPath: status.podIP - name: ES_HEAP_SIZE value: "1024M" - image: nexus3.onap.org:10001/openecomp/sdc-cassandra:1.1-STAGING-latest + image: nexus3.onap.org:10001/openecomp/sdc-cassandra:1.0-STAGING-latest name: sdc-cs volumeMounts: - mountPath: /var/lib/cassandra/ @@ -72,15 +72,15 @@ spec: volumes: - name: sdc-sdc-cs-cs hostPath: - path: /dockerdata/onapdemo/sdc/sdc-cs/CS + path: /dockerdata-nfs/onapdemo/sdc/sdc-cs/CS - name: sdc-environments hostPath: - path: /dockerdata/onapdemo/sdc/environments + path: /dockerdata-nfs/onapdemo/sdc/environments - name: sdc-localtime hostPath: path: /etc/localtime - name: sdc-logs hostPath: - path: /dockerdata/onapdemo/sdc/logs + path: /dockerdata-nfs/onapdemo/sdc/logs imagePullSecrets: - name: onap-docker-registry-key diff --git a/kubernetes/sdc/sdc-es.yaml b/kubernetes/sdc/sdc-es.yaml index e5c9c916da..5176b93d21 100644 --- a/kubernetes/sdc/sdc-es.yaml +++ b/kubernetes/sdc/sdc-es.yaml @@ -15,7 +15,7 @@ spec: name: sdc-es spec: containers: - - image: nexus3.onap.org:10001/openecomp/sdc-elasticsearch:1.1-STAGING-latest + - image: nexus3.onap.org:10001/openecomp/sdc-elasticsearch:1.0-STAGING-latest name: sdc-es env: - name: ENVNAME @@ -46,15 +46,15 @@ spec: volumes: - name: sdc-sdc-es-es hostPath: - path: /dockerdata/onapdemo/sdc/sdc-es/ES + path: /dockerdata-nfs/onapdemo/sdc/sdc-es/ES - name: sdc-environments hostPath: - path: /dockerdata/onapdemo/sdc/environments + path: /dockerdata-nfs/onapdemo/sdc/environments - name: sdc-localtime hostPath: path: /etc/localtime - name: sdc-logs hostPath: - path: /dockerdata/onapdemo/sdc/logs + path: /dockerdata-nfs/onapdemo/sdc/logs imagePullSecrets: - name: onap-docker-registry-key diff --git a/kubernetes/sdc/sdc-fe.yaml b/kubernetes/sdc/sdc-fe.yaml index e2fdb4825b..d984bbedb8 100644 --- a/kubernetes/sdc/sdc-fe.yaml +++ b/kubernetes/sdc/sdc-fe.yaml @@ -55,7 +55,7 @@ spec: valueFrom: fieldRef: fieldPath: status.podIP - image: nexus3.onap.org:10001/openecomp/sdc-frontend:1.1-STAGING-latest + image: nexus3.onap.org:10001/openecomp/sdc-frontend:1.0-STAGING-latest volumeMounts: - mountPath: /usr/share/elasticsearch/data/ name: sdc-sdc-es-es @@ -80,21 +80,21 @@ spec: volumes: - name: sdc-sdc-es-es hostPath: - path: /dockerdata/onapdemo/sdc/sdc-es/ES + path: /dockerdata-nfs/onapdemo/sdc/sdc-es/ES - name: sdc-environments hostPath: - path: /dockerdata/onapdemo/sdc/environments + path: /dockerdata-nfs/onapdemo/sdc/environments - name: sdc-jetty-keystore hostPath: - path: /dockerdata/onapdemo/sdc/jetty/keystore + path: /dockerdata-nfs/onapdemo/sdc/jetty/keystore - name: sdc-localtime hostPath: path: /etc/localtime - name: sdc-logs hostPath: - path: /dockerdata/onapdemo/sdc/logs + path: /dockerdata-nfs/onapdemo/sdc/logs - name: sdc-fe-config hostPath: - path: /dockerdata/onapdemo/sdc/sdc-fe/FE_2_setup_configuration.rb + path: /dockerdata-nfs/onapdemo/sdc/sdc-fe/FE_2_setup_configuration.rb imagePullSecrets: - name: onap-docker-registry-key diff --git a/kubernetes/sdc/sdc-kb.yaml b/kubernetes/sdc/sdc-kb.yaml index 1f515c9341..b79f4ca17b 100644 --- a/kubernetes/sdc/sdc-kb.yaml +++ b/kubernetes/sdc/sdc-kb.yaml @@ -48,7 +48,7 @@ spec: value: AUTO - name: ELASTICSEARCH_URL value: http://sdc-es:9200 - image: nexus3.onap.org:10001/openecomp/sdc-kibana:1.1-STAGING-latest + image: nexus3.onap.org:10001/openecomp/sdc-kibana:1.0-STAGING-latest name: sdc-kb volumeMounts: - mountPath: /root/chef-solo/environments/ @@ -67,12 +67,12 @@ spec: volumes: - name: sdc-environments hostPath: - path: /dockerdata/onapdemo/sdc/environments + path: /dockerdata-nfs/onapdemo/sdc/environments - name: sdc-localtime hostPath: path: /etc/localtime - name: sdc-logs hostPath: - path: /dockerdata/onapdemo/sdc/logs + path: /dockerdata-nfs/onapdemo/sdc/logs imagePullSecrets: - name: onap-docker-registry-key -- cgit 1.2.3-korg