diff options
| author |   Munir Ahmad <munir.ahmad@bell.ca> | 2017-08-17 12:04:14 -0400 |
|---|---|---|
| committer | Munir Ahmad <munir.ahmad@bell.ca> | 2017-08-17 12:35:58 -0400 |
| commit | e94258e3be0da3a15680de53b1817490c4173759 (patch) | |
| tree | a0add5147ff2e3a2da78c8117d237bcdb656758d /kubernetes | |
| parent | 76610be9053a1baf9248c6fd51180d247b5ea773 (diff) | |
Revert 0b1332938385cc534b1f034b73f19c145ead87c6
Issue-ID: OOM-66
This reverts commit 0b1332938385cc534b1f034b73f19c145ead87c6.
Change-Id: I05ba7dd5050ee2ef03cf19d1c5c0db03e12a0d4f
Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
Diffstat (limited to 'kubernetes')
38 files changed, 72 insertions, 537 deletions
diff --git a/kubernetes/aai/aai-deployment.yaml b/kubernetes/aai/aai-deployment.yaml index 563d3e8df0..857044d0f3 100644 --- a/kubernetes/aai/aai-deployment.yaml +++ b/kubernetes/aai/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/kubernetes/aai/aai-dmaap-deployment.yaml b/kubernetes/aai/aai-dmaap-deployment.yaml deleted file mode 100644 index 1251302380..0000000000 --- a/kubernetes/aai/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/kubernetes/aai/aai-kafka-deployment.yaml b/kubernetes/aai/aai-kafka-deployment.yaml deleted file mode 100644 index c7f884defd..0000000000 --- a/kubernetes/aai/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/kubernetes/aai/aai-resources-deployment.yaml b/kubernetes/aai/aai-resources-deployment.yaml deleted file mode 100644 index f2b69c4fc1..0000000000 --- a/kubernetes/aai/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/kubernetes/aai/aai-traversal-deployment.yaml b/kubernetes/aai/aai-traversal-deployment.yaml deleted file mode 100644 index ee2bfb8f7f..0000000000 --- a/kubernetes/aai/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/kubernetes/aai/aai-zookeeper-deployment.yaml b/kubernetes/aai/aai-zookeeper-deployment.yaml deleted file mode 100644 index 631d2bd10b..0000000000 --- a/kubernetes/aai/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/kubernetes/aai/data-router-deployment.yaml b/kubernetes/aai/data-router-deployment.yaml deleted file mode 100644 index 6a55305f37..0000000000 --- a/kubernetes/aai/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/kubernetes/aai/hbase-deployment.yaml b/kubernetes/aai/hbase-deployment.yaml index 2dafc72a5d..d39d0c7459 100644 --- a/kubernetes/aai/hbase-deployment.yaml +++ b/kubernetes/aai/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/kubernetes/aai/modelloader-deployment.yaml b/kubernetes/aai/modelloader-deployment.yaml index 7f31bdaa78..e649fc0565 100644 --- a/kubernetes/aai/modelloader-deployment.yaml +++ b/kubernetes/aai/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/kubernetes/aai/search-data-service-deployment.yaml b/kubernetes/aai/search-data-service-deployment.yaml deleted file mode 100644 index 5c72244fa1..0000000000 --- a/kubernetes/aai/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/kubernetes/aai/sparky-be-deployment.yaml b/kubernetes/aai/sparky-be-deployment.yaml deleted file mode 100644 index 3abfc67097..0000000000 --- a/kubernetes/aai/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 diff --git a/kubernetes/appc/appc-deployment.yaml b/kubernetes/appc/appc-deployment.yaml index 5eacf3a6a8..e2f2b4ead4 100644 --- a/kubernetes/appc/appc-deployment.yaml +++ b/kubernetes/appc/appc-deployment.yaml @@ -50,7 +50,7 @@ spec: value: /opt/openecomp/appc/data/properties - name: DMAAP_TOPIC_ENV value: SUCCESS - image: nexus3.onap.org:10001/openecomp/appc-image:1.1-STAGING-latest + image: nexus3.onap.org:10001/openecomp/appc-image:1.0-STAGING-latest name: appc-controller-container volumeMounts: - mountPath: /opt/openecomp/appc/data/properties @@ -68,9 +68,9 @@ spec: volumes: - name: appc-conf hostPath: - path: /dockerdata/onapdemo/appc/conf + path: /dockerdata-nfs/onapdemo/appc/conf - name: sdnc-conf hostPath: - path: /dockerdata/onapdemo/sdnc/conf + path: /dockerdata-nfs/onapdemo/sdnc/conf imagePullSecrets: - name: onap-docker-registry-key diff --git a/kubernetes/appc/db-deployment.yaml b/kubernetes/appc/db-deployment.yaml index ac8788a15b..ee796faca3 100644 --- a/kubernetes/appc/db-deployment.yaml +++ b/kubernetes/appc/db-deployment.yaml @@ -33,6 +33,6 @@ spec: volumes: - name: appc-data hostPath: - path: /dockerdata/onapdemo/appc/data + path: /dockerdata-nfs/onapdemo/appc/data imagePullSecrets: - name: onap-docker-registry-key diff --git a/kubernetes/appc/dgbuilder-deployment.yaml b/kubernetes/appc/dgbuilder-deployment.yaml index 6fa8bcc0c3..de8149390c 100644 --- a/kubernetes/appc/dgbuilder-deployment.yaml +++ b/kubernetes/appc/dgbuilder-deployment.yaml @@ -52,7 +52,7 @@ spec: value: /opt/openecomp/sdnc/data/properties - name: APPC_CONFIG_DIR value: /opt/openecomp/appc/data/properties - image: nexus3.onap.org:10001/openecomp/dgbuilder-sdnc-image:1.1-STAGING-latest + image: nexus3.onap.org:10001/openecomp/dgbuilder-sdnc-image:1.0-STAGING-latest name: appc-dgbuilder-container ports: - containerPort: 3100 diff --git a/kubernetes/message-router/message-router-dmaap.yaml b/kubernetes/message-router/message-router-dmaap.yaml index 427cb503b5..43c39cde8c 100644 --- a/kubernetes/message-router/message-router-dmaap.yaml +++ b/kubernetes/message-router/message-router-dmaap.yaml @@ -63,12 +63,12 @@ spec: volumes: - name: appprops hostPath: - path: /dockerdata/onapdemo/message-router/dmaap/MsgRtrApi.properties + path: /dockerdata-nfs/onapdemo/message-router/dmaap/MsgRtrApi.properties - name: cadi hostPath: - path: /dockerdata/onapdemo/message-router/dmaap/cadi.properties + path: /dockerdata-nfs/onapdemo/message-router/dmaap/cadi.properties - name: mykey hostPath: - path: /dockerdata/onapdemo/message-router/dmaap/mykey + path: /dockerdata-nfs/onapdemo/message-router/dmaap/mykey imagePullSecrets: - name: onap-docker-registry-key diff --git a/kubernetes/message-router/message-router-kafka.yaml b/kubernetes/message-router/message-router-kafka.yaml index c80b6cc76e..3a2b4f06a4 100644 --- a/kubernetes/message-router/message-router-kafka.yaml +++ b/kubernetes/message-router/message-router-kafka.yaml @@ -74,9 +74,9 @@ spec: path: /var/run/docker.sock - name: kafka-data hostPath: - path: /dockerdata/onapdemo/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/ + path: /dockerdata-nfs/onapdemo/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/ - name: start-kafka hostPath: - path: /dockerdata/onapdemo/message-router/dcae-startup-vm-message-router/docker_files/start-kafka.sh + path: /dockerdata-nfs/onapdemo/message-router/dcae-startup-vm-message-router/docker_files/start-kafka.sh imagePullSecrets: - name: onap-docker-registry-key diff --git a/kubernetes/message-router/message-router-zookeeper.yaml b/kubernetes/message-router/message-router-zookeeper.yaml index c573b10671..aca4806595 100644 --- a/kubernetes/message-router/message-router-zookeeper.yaml +++ b/kubernetes/message-router/message-router-zookeeper.yaml @@ -30,6 +30,6 @@ spec: volumes: - name: zookeeper-data hostPath: - path: /dockerdata/onapdemo/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper + path: /dockerdata-nfs/onapdemo/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper imagePullSecrets: - name: onap-docker-registry-key diff --git a/kubernetes/mso/db-deployment.yaml b/kubernetes/mso/db-deployment.yaml index ff39c5b155..f57f4bac87 100644 --- a/kubernetes/mso/db-deployment.yaml +++ b/kubernetes/mso/db-deployment.yaml @@ -28,8 +28,6 @@ spec: volumeMounts: - mountPath: /etc/mysql/conf.d name: mso-mariadb-conf - - mountPath: /var/lib/mysql - name: mso-mariadb-mysql - mountPath: /docker-entrypoint-initdb.d name: mso-mariadb-docker-entrypoint-initdb ports: @@ -43,10 +41,7 @@ spec: volumes: - name: mso-mariadb-conf hostPath: - path: /dockerdata/onapdemo/mso/mariadb/conf.d - - name: mso-mariadb-mysql - hostPath: - path: /dockerdata/onapdemo/mso/mariadb/mysql + path: /dockerdata-nfs/onapdemo/mso/mariadb/conf.d - name: mso-mariadb-docker-entrypoint-initdb hostPath: path: /dockerdata-nfs/onapdemo/mso/mariadb/docker-entrypoint-initdb.d diff --git a/kubernetes/mso/mso-deployment.yaml b/kubernetes/mso/mso-deployment.yaml index 56daa61aa4..fb052df734 100644 --- a/kubernetes/mso/mso-deployment.yaml +++ b/kubernetes/mso/mso-deployment.yaml @@ -42,7 +42,7 @@ spec: containers: - command: - /docker-files/scripts/start-jboss-server.sh - image: nexus3.onap.org:10001/openecomp/mso:1.1-STAGING-latest + image: nexus3.onap.org:10001/openecomp/mso:1.0-STAGING-latest name: mso volumeMounts: - mountPath: /shared @@ -66,9 +66,9 @@ spec: volumes: - name: mso hostPath: - path: /dockerdata/onapdemo/mso/mso + path: /dockerdata-nfs/onapdemo/mso/mso - name: mso-docker-files hostPath: - path: /dockerdata/onapdemo/mso/docker-files + path: /dockerdata-nfs/onapdemo/mso/docker-files imagePullSecrets: - name: onap-docker-registry-key diff --git a/kubernetes/policy/dep-brmsgw.yaml b/kubernetes/policy/dep-brmsgw.yaml index ce37796f2b..6758abf16a 100644 --- a/kubernetes/policy/dep-brmsgw.yaml +++ b/kubernetes/policy/dep-brmsgw.yaml @@ -52,7 +52,7 @@ spec: - /bin/bash - ./do-start.sh - brmsgw - image: nexus3.onap.org:10001/openecomp/policy/policy-pe:1.1-STAGING-latest + image: nexus3.onap.org:10001/openecomp/policy/policy-pe:1.0-STAGING-latest name: brmsgw volumeMounts: - mountPath: /tmp/policy-install/config @@ -60,6 +60,6 @@ spec: volumes: - name: pe hostPath: - path: /dockerdata/onapdemo/policy/opt/policy/config/pe/ + path: /dockerdata-nfs/onapdemo/policy/opt/policy/config/pe/ imagePullSecrets: - name: onap-docker-registry-key diff --git a/kubernetes/policy/dep-drools.yaml b/kubernetes/policy/dep-drools.yaml index a7beb13151..fbc8e17601 100644 --- a/kubernetes/policy/dep-drools.yaml +++ b/kubernetes/policy/dep-drools.yaml @@ -54,7 +54,7 @@ spec: - /bin/bash - -c - ./do-start.sh - image: nexus3.onap.org:10001/openecomp/policy/policy-drools:1.1-STAGING-latest + image: nexus3.onap.org:10001/openecomp/policy/policy-drools:1.0-STAGING-latest name: drools ports: - containerPort: 6969 @@ -71,9 +71,9 @@ spec: volumes: - name: drools-settingsxml hostPath: - path: /dockerdata/onapdemo/policy/drools/settings.xml + path: /dockerdata-nfs/onapdemo/policy/drools/settings.xml - name: drools hostPath: - path: /dockerdata/onapdemo/policy/opt/policy/config/drools/ + path: /dockerdata-nfs/onapdemo/policy/opt/policy/config/drools/ imagePullSecrets: - name: onap-docker-registry-key diff --git a/kubernetes/policy/dep-maria.yaml b/kubernetes/policy/dep-maria.yaml index 14232281ad..21914c8657 100644 --- a/kubernetes/policy/dep-maria.yaml +++ b/kubernetes/policy/dep-maria.yaml @@ -18,7 +18,7 @@ spec: - /bin/bash - -c - exec bash /tmp/do-start.sh - image: nexus3.onap.org:10001/openecomp/policy/policy-db:1.1-STAGING-latest + image: nexus3.onap.org:10001/openecomp/policy/policy-db:1.0-STAGING-latest name: mariadb ports: - containerPort: 3306 diff --git a/kubernetes/policy/dep-nexus.yaml b/kubernetes/policy/dep-nexus.yaml index 02f767bb23..48c289e3e1 100644 --- a/kubernetes/policy/dep-nexus.yaml +++ b/kubernetes/policy/dep-nexus.yaml @@ -43,7 +43,7 @@ spec: - /bin/bash - -c - bash -c "/opt/nexus/nexus-2.14.2-01/bin/nexus start && sleep 1000d" - image: nexus3.onap.org:10001/openecomp/policy/policy-nexus:1.1-STAGING-latest + image: nexus3.onap.org:10001/openecomp/policy/policy-nexus:1.0-STAGING-latest name: nexus imagePullSecrets: - name: onap-docker-registry-key diff --git a/kubernetes/policy/dep-pap.yaml b/kubernetes/policy/dep-pap.yaml index 7501b0ffdc..11420da525 100644 --- a/kubernetes/policy/dep-pap.yaml +++ b/kubernetes/policy/dep-pap.yaml @@ -68,7 +68,7 @@ spec: - /bin/bash - ./do-start.sh - pap - image: nexus3.onap.org:10001/openecomp/policy/policy-pe:1.1-STAGING-latest + image: nexus3.onap.org:10001/openecomp/policy/policy-pe:1.0-STAGING-latest name: pap ports: - containerPort: 8443 @@ -84,6 +84,6 @@ spec: volumes: - name: pe hostPath: - path: /dockerdata/onapdemo/policy/opt/policy/config/pe/ + path: /dockerdata-nfs/onapdemo/policy/opt/policy/config/pe/ imagePullSecrets: - name: onap-docker-registry-key diff --git a/kubernetes/policy/dep-pdp.yaml b/kubernetes/policy/dep-pdp.yaml index ba535dd8d9..0efe5c3773 100644 --- a/kubernetes/policy/dep-pdp.yaml +++ b/kubernetes/policy/dep-pdp.yaml @@ -48,7 +48,7 @@ spec: - /bin/bash - ./do-start.sh - pdp - image: nexus3.onap.org:10001/openecomp/policy/policy-pe:1.1-STAGING-latest + image: nexus3.onap.org:10001/openecomp/policy/policy-pe:1.0-STAGING-latest name: pdp ports: - containerPort: 8081 @@ -63,6 +63,6 @@ spec: volumes: - name: pe hostPath: - path: /dockerdata/onapdemo/policy/opt/policy/config/pe/ + path: /dockerdata-nfs/onapdemo/policy/opt/policy/config/pe/ imagePullSecrets: - name: onap-docker-registry-key diff --git a/kubernetes/policy/dep-pypdp.yaml b/kubernetes/policy/dep-pypdp.yaml index 68603f603f..91d71d56e8 100644 --- a/kubernetes/policy/dep-pypdp.yaml +++ b/kubernetes/policy/dep-pypdp.yaml @@ -50,7 +50,7 @@ spec: - /bin/bash - ./do-start.sh - pypdp - image: nexus3.onap.org:10001/openecomp/policy/policy-pe:1.1-STAGING-latest + image: nexus3.onap.org:10001/openecomp/policy/policy-pe:1.0-STAGING-latest name: pypdp ports: - containerPort: 8480 @@ -65,6 +65,6 @@ spec: volumes: - name: pe hostPath: - path: /dockerdata/onapdemo/policy/opt/policy/config/pe/ + path: /dockerdata-nfs/onapdemo/policy/opt/policy/config/pe/ imagePullSecrets: - name: onap-docker-registry-key diff --git a/kubernetes/robot/robot-deployment.yaml b/kubernetes/robot/robot-deployment.yaml index 2d023edfa8..ade71472fa 100644 --- a/kubernetes/robot/robot-deployment.yaml +++ b/kubernetes/robot/robot-deployment.yaml @@ -13,7 +13,7 @@ spec: name: robot spec: containers: - - image: nexus3.onap.org:10001/openecomp/testsuite:1.1-STAGING-latest + - image: nexus3.onap.org:10001/openecomp/testsuite:1.0-STAGING-latest name: robot volumeMounts: - name: robot-eteshare @@ -36,18 +36,18 @@ spec: volumes: - name: robot-eteshare hostPath: - path: /dockerdata/onapdemo/robot/eteshare + path: /dockerdata-nfs/onapdemo/robot/eteshare - name: robot-assets hostPath: - path: /dockerdata/onapdemo/robot/robot/assets + path: /dockerdata-nfs/onapdemo/robot/robot/assets - name: robot-resources hostPath: - path: /dockerdata/onapdemo/robot/robot/resources + path: /dockerdata-nfs/onapdemo/robot/robot/resources - name: robot-testsuites hostPath: - path: /dockerdata/onapdemo/robot/robot/testsuites + path: /dockerdata-nfs/onapdemo/robot/robot/testsuites - name: lighttpd-authorization hostPath: - path: /dockerdata/onapdemo/robot/authorization + path: /dockerdata-nfs/onapdemo/robot/authorization imagePullSecrets: - name: onap-docker-registry-key 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 diff --git a/kubernetes/sdnc/db-deployment.yaml b/kubernetes/sdnc/db-deployment.yaml index 3ec1ecba3a..685edec242 100644 --- a/kubernetes/sdnc/db-deployment.yaml +++ b/kubernetes/sdnc/db-deployment.yaml @@ -33,6 +33,6 @@ spec: volumes: - name: sdnc-data hostPath: - path: /dockerdata/onapdemo/sdnc/data + path: /dockerdata-nfs/onapdemo/sdnc/data imagePullSecrets: - name: onap-docker-registry-key diff --git a/kubernetes/sdnc/dgbuilder-deployment.yaml b/kubernetes/sdnc/dgbuilder-deployment.yaml index ef7541dd63..13781ff939 100644 --- a/kubernetes/sdnc/dgbuilder-deployment.yaml +++ b/kubernetes/sdnc/dgbuilder-deployment.yaml @@ -50,7 +50,7 @@ spec: value: openECOMP1.0 - name: SDNC_CONFIG_DIR value: /opt/openecomp/sdnc/data/properties - image: nexus3.onap.org:10001/openecomp/dgbuilder-sdnc-image:1.1-STAGING-latest + image: nexus3.onap.org:10001/openecomp/dgbuilder-sdnc-image:1.0-STAGING-latest name: sdnc-dgbuilder-container ports: - containerPort: 3100 diff --git a/kubernetes/sdnc/sdnc-deployment.yaml b/kubernetes/sdnc/sdnc-deployment.yaml index d577b82300..0dc48393e4 100644 --- a/kubernetes/sdnc/sdnc-deployment.yaml +++ b/kubernetes/sdnc/sdnc-deployment.yaml @@ -46,7 +46,7 @@ spec: value: openECOMP1.0 - name: SDNC_CONFIG_DIR value: /opt/openecomp/sdnc/data/properties - image: nexus3.onap.org:10001/openecomp/sdnc-image:1.1-STAGING-latest + image: nexus3.onap.org:10001/openecomp/sdnc-image:1.0-STAGING-latest name: sdnc-controller-container volumeMounts: - mountPath: /opt/openecomp/sdnc/data/properties @@ -61,6 +61,6 @@ spec: volumes: - name: sdnc-conf hostPath: - path: /dockerdata/onapdemo/sdnc/conf + path: /dockerdata-nfs/onapdemo/sdnc/conf imagePullSecrets: - name: onap-docker-registry-key diff --git a/kubernetes/sdnc/web-deployment.yaml b/kubernetes/sdnc/web-deployment.yaml index 7dc183af52..36df93beea 100644 --- a/kubernetes/sdnc/web-deployment.yaml +++ b/kubernetes/sdnc/web-deployment.yaml @@ -50,7 +50,7 @@ spec: value: openECOMP1.0 - name: SDNC_CONFIG_DIR value: /opt/openecomp/sdnc/data/properties - image: nexus3.onap.org:10001/openecomp/admportal-sdnc-image:1.1-STAGING-latest + image: nexus3.onap.org:10001/openecomp/admportal-sdnc-image:1.0-STAGING-latest name: sdnc-portal-container ports: - containerPort: 8843 diff --git a/kubernetes/vid/vid-mariadb-deployment.yaml b/kubernetes/vid/vid-mariadb-deployment.yaml index cb28e60343..93a798a04d 100644 --- a/kubernetes/vid/vid-mariadb-deployment.yaml +++ b/kubernetes/vid/vid-mariadb-deployment.yaml @@ -43,12 +43,12 @@ spec: volumes: - name: vid-mariadb-data hostPath: - path: /dockerdata/onapdemo/vid/mariadb/data + path: /dockerdata-nfs/onapdemo/vid/mariadb/data - name: vid-pre-init hostPath: - path: /dockerdata/onapdemo/vid/vid/lf_config/vid-pre-init.sql + path: /dockerdata-nfs/onapdemo/vid/vid/lf_config/vid-pre-init.sql - name: my-cnf hostPath: - path: /dockerdata/onapdemo/vid/vid/lf_config/vid-my.cnf + path: /dockerdata-nfs/onapdemo/vid/vid/lf_config/vid-my.cnf imagePullSecrets: - name: onap-docker-registry-key diff --git a/kubernetes/vid/vid-server-deployment.yaml b/kubernetes/vid/vid-server-deployment.yaml index 471889eeb0..1e6e9de80d 100644 --- a/kubernetes/vid/vid-server-deployment.yaml +++ b/kubernetes/vid/vid-server-deployment.yaml @@ -82,7 +82,7 @@ spec: value: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U - name: VID_MYSQL_MAXCONNECTIONS value: "5" - image: nexus3.onap.org:10001/openecomp/vid:1.1-STAGING-latest + image: nexus3.onap.org:10001/openecomp/vid:1.0-STAGING-latest name: vid-server ports: - containerPort: 8080 |