Merge "Add Consul support to 'OneClick' deployment."

diff --git a/kubernetes/appc/templates/appc-deployment.yaml b/kubernetes/appc/templates/appc-deployment.yaml
index 8046107..661980b 100644 (file)
--- a/kubernetes/appc/templates/appc-deployment.yaml
+++ b/kubernetes/appc/templates/appc-deployment.yaml
@@ -46,7 +46,7 @@ spec:
         - name: MYSQL_ROOT_PASSWORD
           value: openECOMP1.0
         - name: SDNC_CONFIG_DIR
-          value: /opt/openecomp/sdnc/data/properties
+          value: /opt/openecomp/appc/data/properties
         - name: APPC_CONFIG_DIR
           value: /opt/openecomp/appc/data/properties
         - name: DMAAP_TOPIC_ENV

diff --git a/kubernetes/multicloud/templates/framework-deployment.yaml b/kubernetes/multicloud/templates/framework-deployment.yaml
index ad1dac8..9f122f0 100644 (file)
--- a/kubernetes/multicloud/templates/framework-deployment.yaml
+++ b/kubernetes/multicloud/templates/framework-deployment.yaml
@@ -17,8 +17,8 @@ spec:
      containers:
      - env:
        - name: MSB_ADDR
-         value: "{{ .Values.msbgateway }}"
-       _ name: MSB_PORT
+         value: {{ .Values.msbgateway }}
+       - name: MSB_PORT
          value: "{{ .Values.msbPort }}"
        - name: AAI_ADDR
          value: aai-service.{{ .Values.nsPrefix }}-aai
@@ -55,5 +55,3 @@ spec:
          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/multicloud/framework/logs
      imagePullSecrets:
      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-
-

diff --git a/kubernetes/portal/values.yaml b/kubernetes/portal/values.yaml
index da851e0..4a3cbd1 100644 (file)
--- a/kubernetes/portal/values.yaml
+++ b/kubernetes/portal/values.yaml
@@ -3,11 +3,11 @@ pullPolicy: Always
 nodePortPrefix: 302
 image:
   readiness: oomk8s/readiness-check:1.0.0
-  portalapps: nexus3.onap.org:10001/openecomp/portalapps:1.1-STAGING-latest
-  portaldb: nexus3.onap.org:10001/openecomp/portaldb:1.1-STAGING-latest
+  portalapps: nexus3.onap.org:10001/openecomp/portal-apps:1.1-STAGING-latest
+  portaldb: nexus3.onap.org:10001/openecomp/portal-db:1.1-STAGING-latest
   mariadbClient: oomk8s/mariadb-client-init:1.0.0
-  portalwms: nexus3.onap.org:10001/openecomp/portalwms:1.1-STAGING-latest
+  portalwms: nexus3.onap.org:10001/openecomp/portal-wms:1.1-STAGING-latest
   ubuntuInit: oomk8s/ubuntu-init:1.0.0
   ubuntuDesktop: dorowu/ubuntu-desktop-lxde-vnc
 onapPortal:
-  webappsDir: "/opt/apache-tomcat-8.0.37/webapps"
\ No newline at end of file
+  webappsDir: "/opt/apache-tomcat-8.0.37/webapps"