Revert 0b1332938385cc534b1f034b73f19c145ead87c6

Issue-ID: OOM-66
This reverts commit 0b1332938385cc534b1f034b73f19c145ead87c6.

Change-Id: I05ba7dd5050ee2ef03cf19d1c5c0db03e12a0d4f
Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>

diff --git a/aai-deployment.yaml b/aai-deployment.yaml
index 563d3e8..857044d 100644 (file)
--- a/aai-deployment.yaml
+++ b/aai-deployment.yaml
@@ -52,7 +52,7 @@ spec:
           value: noninteractive
         - name: JAVA_HOME
           value: /usr/lib/jvm/java-8-openjdk-amd64
-        image: nexus3.onap.org:10001/openecomp/ajsc-aai:1.1-STAGING-latest
+        image: nexus3.onap.org:10001/openecomp/ajsc-aai:1.0-STAGING-latest
         name: aai-service
         volumeMounts:
         - mountPath: /etc/ssl/certs/
@@ -74,16 +74,16 @@ spec:
       volumes:
         - name: aai-service-certs
           hostPath:
-            path: /dockerdata/onapdemo/aai/etc/ssl/certs/
+            path: /dockerdata-nfs/onapdemo/aai/etc/ssl/certs/
         - name: aai-service-logroot
           hostPath:
-            path: /dockerdata/onapdemo/aai/opt/aai/logroot/
+            path: /dockerdata-nfs/onapdemo/aai/opt/aai/logroot/
         - name: aai-config
           hostPath:
-            path: /dockerdata/onapdemo/aai/aai-config/
+            path: /dockerdata-nfs/onapdemo/aai/aai-config/
         - name: aai-data
           hostPath:
-            path: /dockerdata/onapdemo/aai/aai-data/
+            path: /dockerdata-nfs/onapdemo/aai/aai-data/
       restartPolicy: Always
       imagePullSecrets:
       - name: onap-docker-registry-key

diff --git a/aai-dmaap-deployment.yaml b/aai-dmaap-deployment.yaml
deleted file mode 100644 (file)
index 1251302..0000000
--- a/aai-dmaap-deployment.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: aai-dmaap
-spec:
-  selector:
-    matchLabels:
-      app: aai-dmaap
-  template:
-    metadata:
-      labels:
-        app: aai-dmaap
-      name: aai-dmaap
-    spec:
-      containers:
-      - env:
-        - name: LANG
-          value: C.UTF-8
-        - name: JAVA_VERSION
-          value: 8u111
-        - name: JAVA_DEBIAN_VERSION
-          value: 8u111-b14-2~bpo8+1
-        - name: CA_CERTIFICATES_JAVA_VERSION
-          value: 20140324
-        - name: PATH
-          value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-        - name: JAVA_HOME
-          value: /usr/lib/jvm/java-8-openjdk-amd64
-        image: nexus3.onap.org:10001/openecomp/dmaap:latest
-        name: aai-dmaap
-        volumeMounts:
-        - mountPath: /appl/dmaapMR1/bundleconfig/etc/appprops/MsgRtrApi.properties
-          name: aai-dmaap-config
-        - mountPath: /opt/message-router/docker_files/mykey
-          name: aai-dmaap-key
-        - mountPath: /opt/message-router/docker_files/cadi.properties
-          name: aai-dmaap-cadi
-      volumes:
-        - name: aai-dmaap-config
-          hostPath:
-            path: /dockerdata/onapdemo/aai/aai-dmaap-config
-        - name: aai-dmaap-key
-          hostPath:
-            path: /dockerdata/onapdemo/aai/aai-dmaap-key
-        - name: aai-dmaap-cadi
-          hostPath:
-            path: /dockerdata/onapdemo/aai/aai-dmaap-cadi
-        ports:
-        - containerPort: 3904
-        - containerPort: 3905
-        readinessProbe:
-          tcpSocket:
-            port: 8080
-          initialDelaySeconds: 5
-          periodSeconds: 10
-      restartPolicy: Always
-      imagePullSecrets:
-      - name: onap-docker-registry-key

diff --git a/aai-kafka-deployment.yaml b/aai-kafka-deployment.yaml
deleted file mode 100644 (file)
index c7f884d..0000000
--- a/aai-kafka-deployment.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: aai-kafka
-spec:
-  selector:
-    matchLabels:
-      app: aai-kafka
-  template:
-    metadata:
-      labels:
-        app: aai-kafka
-      name: aai-kafka
-    spec:
-      containers:
-      - env:
-        - name: KAFKA_ZOOKEEPER_CONNECT
-          value: zookeeper:2181
-        - name: KAFKA_ADVERTISED_HOST_NAME
-          value: kafka
-        - name: KAFKA_BROKER_ID
-          value: 1
-        - name: PATH
-          value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/jdk/bin
-        - name: JAVA_VERSION_MAJOR
-          value: 8
-        - name: JAVA_VERSION_MINOR
-          value: 144
-        - name: JAVA_VERSION_BUILD
-          value: 01
-        - name: JAVA_PACKAGE
-          value: server-jre
-        - name: JAVA_JCE
-          value: standard
-        - name: JAVA_HOME
-          value: /opt/jdk
-        - name: GLIBC_VERSION
-          value: 2.23-r3
-        - name: LANG
-          value: C.UTF-8
-        - name: KAFKA_VERSION
-          value: 0.8.1.1
-        - name: SCALA_VERSION
-          value: 2.9.2
-        - name: KAFKA_HOME
-          value: /opt/kafka_2.9.2-0.8.1.1
-        image: nexus3.onap.org:10001/openecomp/dmaap:latest
-        name: aai-kafka
-        volumeMounts:
-        - mountPath: /start-kafka.sh
-          name: aai-kafka-start
-        - mountPath: /var/run/docker.sock
-          name: aai-kafka-sock
-        - mountPath: /kafka
-          name: aai-kafka-data
-      volumes:
-        - name: aai-kafka-start
-          hostPath:
-            path: /dockerdata/onapdemo/aai/kafka/start
-        - name: aai-kafka-sock
-          hostPath:
-            path: /dockerdata/onapdemo/aai/kafka/sock
-        - name: aai-kafka-data
-          hostPath:
-            path: /dockerdata/onapdemo/aai/kafka/data
-        ports:
-        - containerPort: 9092
-        readinessProbe:
-          tcpSocket:
-            port: 8080
-          initialDelaySeconds: 5
-          periodSeconds: 10
-      restartPolicy: Always
-      imagePullSecrets:
-      - name: onap-docker-registry-key

diff --git a/aai-resources-deployment.yaml b/aai-resources-deployment.yaml
deleted file mode 100644 (file)
index f2b69c4..0000000
--- a/aai-resources-deployment.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: aai-resources
-spec:
-  selector:
-    matchLabels:
-      app: aai-resources
-  template:
-    metadata:
-      labels:
-        app: aai-resources
-      name: aai-resources
-    spec:
-      containers:
-      - env:
-        - name: CHEF_BRANCH
-          value: master
-        - name: AAI_CHEF_ENV
-          value: simpledemo
-        - name: AAI_CORE_VERSION
-          value: 1.1.0-SNAPSHOT
-        - name: AAI_CHEF_LOC
-          value: /var/chef/aai-data/environments
-        - name: CHEF_GIT_URL
-          value: http://gerrit.onap.org/r/aai
-        - name: PATH
-          value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-        - name: JAVA_HOME
-          value: /usr/lib/jvm/java-8-openjdk-amd64
-        - name: DEBIAN_FRONTEND
-          value: noninteractive
-        image: nexus3.onap.org:10001/openecomp/aai-resources:1.1-STAGING-latest
-        name: aai-resources
-        volumeMounts:
-        - mountPath: /opt/aai/logroot/AAI-RES/
-          name: aai-resources
-      volumes:
-        - name: aai-resources
-          hostPath:
-            path: /dockerdata/onapdemo/aai/aai-resources
-        ports:
-        - containerPort: 8447
-        readinessProbe:
-          tcpSocket:
-            port: 8080
-          initialDelaySeconds: 5
-          periodSeconds: 10
-      restartPolicy: Always
-      imagePullSecrets:
-      - name: onap-docker-registry-key

diff --git a/aai-traversal-deployment.yaml b/aai-traversal-deployment.yaml
deleted file mode 100644 (file)
index ee2bfb8..0000000
--- a/aai-traversal-deployment.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: aai-traversal
-spec:
-  selector:
-    matchLabels:
-      app: aai-traversal
-  template:
-    metadata:
-      labels:
-        app: aai-traversal
-      name: aai-traversal
-    spec:
-      containers:
-      - env:
-        - name: CHEF_BRANCH
-          value: master
-        - name: AAI_CHEF_ENV
-          value: simpledemo
-        - name: AAI_CORE_VERSION
-          value: 1.1.0-SNAPSHOT
-        - name: AAI_CHEF_LOC
-          value: /var/chef/aai-data/environments
-        - name: CHEF_GIT_URL
-          value: http://gerrit.onap.org/r/aai
-        - name: PATH
-          value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-        - name: JAVA_HOME
-          value: usr/lib/jvm/java-8-openjdk-amd64
-        - name: DEBIAN_FRONTEND
-          value: noninteractive
-        image: nexus3.onap.org:10001/openecomp/aai-traversal:1.1-STAGING-latest
-        name: aai-traversal
-        volumeMounts:
-        - mountPath: /opt/aai/logroot/AAI-GQ/
-          name: aai-traversal-logs
-      volumes:
-        - name: aai-traversal-logs
-          hostPath:
-            path: /dockerdata/onapdemo/aai/aai-traversal/logs/
-        ports:
-        - containerPort: 8446
-        readinessProbe:
-          tcpSocket:
-            port: 8080
-          initialDelaySeconds: 5
-          periodSeconds: 10
-      restartPolicy: Always
-      imagePullSecrets:
-      - name: onap-docker-registry-key

diff --git a/aai-zookeeper-deployment.yaml b/aai-zookeeper-deployment.yaml
deleted file mode 100644 (file)
index 631d2bd..0000000
--- a/aai-zookeeper-deployment.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: aai-zookeeper
-spec:
-  selector:
-    matchLabels:
-      app: aai-zookeeper
-  template:
-    metadata:
-      labels:
-        app: aai-zookeeper
-      name: aai-zookeeper
-    spec:
-      containers:
-      - env:
-        - name: ZOOKEEPER_VERSION
-          value: 3.4.9
-        - name: PATH
-          value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-        - name: JAVA_HOME
-          value: usr/lib/jvm/java-8-openjdk-amd64
-        - name: ZK_HOME
-          value: /opt/zookeeper-3.4.9
-        image: nexus3.onap.org:10001/openecomp/zookeeper:latest
-        name: aai-zookeeper
-        volumeMounts:
-        - mountPath: /opt/zookeeper-3.4.9/conf/
-          name: aai-zookeeper-config
-        - mountPath: /opt/zookeeper-3.4.9/data/
-          name: aai-zookeeper-data
-      volumes:
-        - name: aai-zookeeper-config
-          hostPath:
-            path: /dockerdata/onapdemo/aai/zookeeper/config/
-        - name: aai-zookeeper-data
-          hostPath:
-            path: /dockerdata/onapdemo/aai/zookeeper/data/
-        ports:
-        - containerPort: 2181
-        - containerPort: 2888
-        - containerPort: 3888
-        - containerPort: 22
-        readinessProbe:
-          tcpSocket:
-            port: 8080
-          initialDelaySeconds: 5
-          periodSeconds: 10
-      restartPolicy: Always
-      imagePullSecrets:
-      - name: onap-docker-registry-key

diff --git a/data-router-deployment.yaml b/data-router-deployment.yaml
deleted file mode 100644 (file)
index 6a55305..0000000
--- a/data-router-deployment.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: data-router
-spec:
-  selector:
-    matchLabels:
-      app: data-router
-  template:
-    metadata:
-      labels:
-        app: data-router
-      name: data-router
-    spec:
-      containers:
-      - env:
-        - name: SERVICE_BEANS
-          value: /opt/app/data-router/dynamic/conf
-        - name: CONFIG_HOME
-          value: /opt/app/data-router/config/
-        - name: KEY_STORE_PASSWORD
-          value: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
-        - name: DYNAMIC_ROUTES
-          value: /opt/app/data-router/dynamic/routes
-        - name: KEY_MANAGER_PASSWORD
-          value: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
-        - name: PATH
-          value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-        - name: JAVA_HOME
-          value: usr/lib/jvm/java-8-openjdk-amd64
-        image: nexus3.onap.org:10001/openecomp/data-router:1.1-STAGING-latest
-        name: data-router
-        volumeMounts:
-        - mountPath: /opt/app/data-router/config/
-          name: data-router-config
-        - mountPath: /opt/app/data-router/dynamic/
-          name: data-router-dynamic
-        - mountPath: /logs/
-          name: data-router-logs
-      volumes:
-        - name: data-router-config
-          hostPath:
-            path: /dockerdata/onapdemo/aai/data-router/config/
-        - name: data-router-dynamic
-          hostPath:
-            path: /dockerdata/onapdemo/aai/data-router/dynamic/
-        - name: data-router-logs
-          hostPath:
-            path: /dockerdata/onapdemo/aai/data-router/logs/
-        ports:
-        - containerPort: 9502
-        readinessProbe:
-          tcpSocket:
-            port: 8080
-          initialDelaySeconds: 5
-          periodSeconds: 10
-      restartPolicy: Always
-      imagePullSecrets:
-      - name: onap-docker-registry-key

diff --git a/hbase-deployment.yaml b/hbase-deployment.yaml
index 2dafc72..d39d0c7 100644 (file)
--- a/hbase-deployment.yaml
+++ b/hbase-deployment.yaml
@@ -16,7 +16,7 @@ spec:
       volumes:
         - name: hbase-opt-data
           hostPath:
-            path: /dockerdata/onapdemo/aai/hbase/opt/data
+            path: /dockerdata-nfs/onapdemo/aai/hbase/opt/data
       containers:
       - name: hbase
         image: aaidocker/aai-hbase-1.2.3:latest

diff --git a/modelloader-deployment.yaml b/modelloader-deployment.yaml
index 7f31bda..e649fc0 100644 (file)
--- a/modelloader-deployment.yaml
+++ b/modelloader-deployment.yaml
@@ -82,26 +82,8 @@ spec:
           value: ModelLoader
         - name: APP_SERVER_AUTH_PASSWORD
           value: OBF:1qvu1v2h1sov1sar1wfw1j7j1wg21saj1sov1v1x1qxw
-        - name: CONFIG_HOME
-          value: /opt/app/model-loader/config/
-        - name: PATH
-          value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-        - name: JAVA_HOME
-          value: usr/lib/jvm/java-8-openjdk-amd64
-        image: nexus3.onap.org:10001/openecomp/model-loader:1.1-STAGING-latest
+        image: nexus3.onap.org:10001/openecomp/model-loader:1.0-STAGING-latest
         name: model-loader-service
-        volumeMounts:
-        - mountPath: /opt/app/model-loader/config/
-          name: aai-model-loader-config
-        - mountPath: /logs/
-          name: aai-model-loader-config
-      volumes:
-        - name: aai-model-loader-config
-          hostPath:
-            path: /dockerdata/onapdemo/aai/model-loader/config/
-        - name: aai-model-loader-logs
-          hostPath:
-            path: /dockerdata/onapdemo/aai/model-loader/logs/
         ports:
         - containerPort: 8080
         - containerPort: 8443

diff --git a/search-data-service-deployment.yaml b/search-data-service-deployment.yaml
deleted file mode 100644 (file)
index 5c72244..0000000
--- a/search-data-service-deployment.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: search-data-service
-spec:
-  selector:
-    matchLabels:
-      app: search-data-service
-  template:
-    metadata:
-      labels:
-        app: search-data-service
-      name: search-data-service
-    spec:
-      containers:
-      - env:
-        - name: CONFIG_HOME
-          value: /opt/app/search-data-service/config/
-        - name: PATH
-          value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-        - name: JAVA_HOME
-          value: usr/lib/jvm/java-8-openjdk-amd64
-        image: nexus3.onap.org:10001/openecomp/search-data-service:1.1-STAGING-latest
-        name: search-data-service
-        volumeMounts:
-        - mountPath: /opt/app/search-data-service/config/
-          name: aai-search-data-service-config
-        - mountPath: /logs/
-          name: aai-search-data-service-logs
-      volumes:
-        - name: aai-search-data-service-config
-          hostPath:
-            path: /dockerdata/onapdemo/aai/search-data-service/config/
-        - name: aai-search-data-servic-logs
-          hostPath:
-            path: /dockerdata/onapdemo/aai/search-data-service/logs/
-        ports:
-        - containerPort: 9509
-        readinessProbe:
-          tcpSocket:
-            port: 8080
-          initialDelaySeconds: 5
-          periodSeconds: 10
-      restartPolicy: Always
-      imagePullSecrets:
-      - name: onap-docker-registry-key

diff --git a/sparky-be-deployment.yaml b/sparky-be-deployment.yaml
deleted file mode 100644 (file)
index 3abfc67..0000000
--- a/sparky-be-deployment.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: sparky-be
-spec:
-  selector:
-    matchLabels:
-      app: sparky-be
-  template:
-    metadata:
-      labels:
-        app: sparky-be
-      name: sparky-be
-    spec:
-      containers:
-      - env:
-        - name: CONFIG_HOME
-          value: /opt/app/sparky/config/
-        - name: PATH
-          value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-        - name: JAVA_HOME
-          value: usr/lib/jvm/java-8-openjdk-amd64
-        - name: KEY_MANAGER_PASSWORD
-          value: OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
-        - name: KEY_STORE_PASSWORD
-          value: OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
-        image: nexus3.onap.org:10001/openecomp/sparky-be:1.1-STAGING-latest
-        name: sparky-be
-        volumeMounts:
-        - mountPath: /opt/app/sparky/config/
-          name: aai-sparky-be-config
-        - mountPath: /logs/
-          name: aai-sparky-be-logs
-      volumes:
-        - name: aai-sparky-be-config
-          hostPath:
-            path: /dockerdata/onapdemo/aai/sparky-be/config/
-        - name: aai-sparky-be-logs
-          hostPath:
-            path: /dockerdata/onapdemo/aai/sparky-be/logs/
-        ports:
-        - containerPort: 8000
-        - containerPort: 9517
-        readinessProbe:
-          tcpSocket:
-            port: 8080
-          initialDelaySeconds: 5
-          periodSeconds: 10
-      restartPolicy: Always
-      imagePullSecrets:
-      - name: onap-docker-registry-key