Merge "Adjust UUI to latest"

diff --git a/kubernetes/aai/templates/aai-deployment.yaml b/kubernetes/aai/templates/aai-deployment.yaml
index 3f714f3..c2220ca 100644 (file)
--- a/kubernetes/aai/templates/aai-deployment.yaml
+++ b/kubernetes/aai/templates/aai-deployment.yaml
@@ -62,7 +62,7 @@ spec:
             path: /etc/localtime
         - name: aai-service-log
           hostPath:
-            path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/haproxy/log/"
+            path: "/dev/log"
         - name: haproxy-cfg
           hostPath:
             path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/haproxy/haproxy.cfg"

diff --git a/kubernetes/appc/templates/dgbuilder-deployment.yaml b/kubernetes/appc/templates/dgbuilder-deployment.yaml
index b9495a7..32ccdaf 100644 (file)
--- a/kubernetes/appc/templates/dgbuilder-deployment.yaml
+++ b/kubernetes/appc/templates/dgbuilder-deployment.yaml
@@ -51,9 +51,7 @@ spec:
         - name: MYSQL_ROOT_PASSWORD
           value: openECOMP1.0
         - name: SDNC_CONFIG_DIR
-          value: /opt/openecomp/sdnc/data/properties
-        - name: APPC_CONFIG_DIR
-          value: /opt/openecomp/appc/data/properties
+          value: /opt/onap/sdnc/data/properties
         image: {{ .Values.image.dgbuilderSdnc }}
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: appc-dgbuilder-container

diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml
index 624c642..882267c 100644 (file)
--- a/kubernetes/appc/values.yaml
+++ b/kubernetes/appc/values.yaml
@@ -3,7 +3,7 @@ pullPolicy: Always
 nodePortPrefix: 302
 image:
   readiness: oomk8s/readiness-check:1.0.0
-  appc: nexus3.onap.org:10001/openecomp/appc-image:1.1-STAGING-latest
+  appc: nexus3.onap.org:10001/openecomp/appc-image:v1.2.0
   mysqlServer: mysql/mysql-server:5.6
-  dgbuilderSdnc: nexus3.onap.org:10001/onap/ccsdk-dgbuilder-image:0.1-STAGING-latest
+  dgbuilderSdnc: nexus3.onap.org:10001/onap/ccsdk-dgbuilder-image:v0.1.0
   filebeat: docker.elastic.co/beats/filebeat:5.5.0
\ No newline at end of file

diff --git a/kubernetes/clamp/templates/clamp-deployment.yaml b/kubernetes/clamp/templates/clamp-deployment.yaml
index 493bb49..61091a8 100644 (file)
--- a/kubernetes/clamp/templates/clamp-deployment.yaml
+++ b/kubernetes/clamp/templates/clamp-deployment.yaml
@@ -45,9 +45,10 @@ spec:
       containers:
       - env:
         - name: SPRING_APPLICATION_JSON
-          value: '{"spring.datasource.camunda.url":"jdbc:mysql://clamp-mariadb.{{ .Values.nsPrefix }}-clamp:3306/camundabpm?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&maxReconnects=100","spring.datasource.camunda.username":
-            "root","spring.datasource.camunda.password": "{{ .Values.mysqlPassword }}", "spring.datasource.cldsdb.url":"jdbc:mysql://clamp-mariadb.{{ .Values.nsPrefix }}-clamp:3306/cldsdb4?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&maxReconnects=100","spring.datasource.cldsdb.username":
-            "root", "spring.datasource.cldsdb.password": "{{ .Values.mysqlPassword }}"}'
+          value: '{
+  "spring.datasource.camunda.url": "jdbc:mariadb:sequential://clamp-mariadb.{{ .Values.nsPrefix }}-clamp:3306/camundabpm?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647",
+  "spring.datasource.cldsdb.url": "jdbc:mariadb:sequential://clamp-mariadb.{{ .Values.nsPrefix }}-clamp:3306/cldsdb4?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647"
+  }'
         image: {{ .Values.image.clampImage }}:{{ .Values.image.clampVersion }}
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: clamp

diff --git a/kubernetes/clamp/values.yaml b/kubernetes/clamp/values.yaml
index c0362dd..c522be0 100644 (file)
--- a/kubernetes/clamp/values.yaml
+++ b/kubernetes/clamp/values.yaml
@@ -5,6 +5,6 @@ mysqlPassword: strong_pitchou
 image:
   readiness: oomk8s/readiness-check:1.0.0
   clampImage: nexus3.onap.org:10001/onap/clamp
-  clampVersion: 1.1-STAGING-latest
+  clampVersion: v1.1.0
   mariadbImage: nexus3.onap.org:10001/mariadb
   mariadbVersion: 10.1.11

diff --git a/kubernetes/config/docker/init/config-init.sh b/kubernetes/config/docker/init/config-init.sh
index 0f54002..90e96b3 100755 (executable)
--- a/kubernetes/config/docker/init/config-init.sh
+++ b/kubernetes/config/docker/init/config-init.sh
@@ -41,7 +41,6 @@ mkdir -p /config-init/$NAMESPACE/sdc/logs/ASDC/ASDC-BE/
 mkdir -p /config-init/$NAMESPACE/sdc/logs/ASDC/ASDC-FE/
 mkdir -p /config-init/$NAMESPACE/aai/opt/aai/logroot/
 mkdir -p /config-init/$NAMESPACE/aai/model-loader/logs/
-mkdir -p /config-init/$NAMESPACE/aai/haproxy/log/
 mkdir -p /config-init/$NAMESPACE/aai/aai-traversal/logs/
 mkdir -p /config-init/$NAMESPACE/aai/aai-resources/logs/
 mkdir -p /config-init/$NAMESPACE/aai/sparky-be/logs/

diff --git a/kubernetes/config/docker/init/src/config/aai/data-router/dynamic/conf/entity-event-policy.xml b/kubernetes/config/docker/init/src/config/aai/data-router/dynamic/conf/entity-event-policy.xml
index e0dd8cb..e995053 100644 (file)
--- a/kubernetes/config/docker/init/src/config/aai/data-router/dynamic/conf/entity-event-policy.xml
+++ b/kubernetes/config/docker/init/src/config/aai/data-router/dynamic/conf/entity-event-policy.xml
@@ -4,7 +4,7 @@
               http://www.springframework.org/schema/beans
               http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-  <bean id="eepConfig" class="org.openecomp.datarouter.policy.EntityEventPolicyConfig" >
+  <bean id="eepConfig" class="org.onap.aai.datarouter.policy.EntityEventPolicyConfig" >
     <property name="sourceDomain" value="default" />
     <property name="searchBaseUrl" value="https://search-data-service:9509" />
     <property name="searchEndpoint" value="services/search-data-service/v1/search/indexes/" />
@@ -18,7 +18,7 @@
     <property name="searchKeystore" value="tomcat_keystore" />
   </bean>
 
-  <bean id="entityEventPolicy" class="org.openecomp.datarouter.policy.EntityEventPolicy" init-method="startup" >
+  <bean id="entityEventPolicy" class="org.onap.aai.datarouter.policy.EntityEventPolicy" init-method="startup" >
     <constructor-arg ref="eepConfig"/>
   </bean>
-</beans>
+</beans>
\ No newline at end of file

diff --git a/kubernetes/config/docker/init/src/config/appc/conf/appc.properties b/kubernetes/config/docker/init/src/config/appc/conf/appc.properties
index 2b27ed2..3ac5aae 100644 (file)
--- a/kubernetes/config/docker/init/src/config/appc/conf/appc.properties
+++ b/kubernetes/config/docker/init/src/config/appc/conf/appc.properties
@@ -23,8 +23,8 @@
 ### Properties for demo  ###
 ###                                            ###
 appc.demo.poolMembers=dmaap.onap-message-router:3904
-appc.demo.topic.read=APPC-DEMO-TOPIC
-appc.demo.topic.write=APPC-DEMO-TOPIC
+appc.demo.topic.read=APPC-CL
+appc.demo.topic.write=APPC-CL
 appc.demo.client.name=appcDemoEventListener
 appc.demo.threads.queuesize.min=1
 appc.demo.threads.queuesize.max=1000
@@ -57,6 +57,7 @@ provider1.type=OpenStackProvider
 provider1.name=OpenStack
 provider1.identity=http://localhost:8181/apidoc/explorer/index.html
 provider1.tenant1.name=default
+provider1.tenant1.domain=default
 provider1.tenant1.userid=admin
 provider1.tenant1.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
 
@@ -78,12 +79,12 @@ dmaap.poolMembers=dmaap.onap-message-router:3904
 
 # appc-event-listener-bundle properties (only defined in src/test of default.properties)
 appc.LCM.poolMembers=dmaap.onap-message-router:3904
-appc.LCM.topic.read=testLCM
-appc.LCM.topic.write=testLCM
+appc.LCM.topic.read=APPC-LCM-READ
+appc.LCM.topic.write=APPC-LCM-WRITE
 appc.LCM.client.name=APPC-EVENT-LISTENER-TEST
 appc.LCM.provider.user=admin
 appc.LCM.provider.pass=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
-
+appc.LCM.provider.url=http://localhost:8181/restconf/operations/appc-provider-lcm
 
 # properties from appc-netconf-adapter-bundle, appc-dg-common, appc-dmaap-adapter-bundle
 poolMembers=dmaap.onap-message-router:3904
@@ -101,7 +102,8 @@ test.tenantid=test
 test.vmid=test
 # Port 8774 below is default port for OpenStack's Nova API Service
 test.url=http://api.appc.local/vm/9999999/test/99999999-9999-9999-9999-999999999999
-
+#skips hypervisor check which usually occurs during iaas-adapter-bundle startup
+org.openecomp.appc.iaas.skiphypervisorcheck=true
 
 # Properties from default.properties in the src/test and src/main paths of appc-asdc-listener-bundle
 appc.sdc.host=sdc-be.onap-sdc:8443

diff --git a/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py b/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py
index f50aac9..387a144 100755 (executable)
--- a/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py
+++ b/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py
@@ -1,7 +1,7 @@
 # File generated from /opt/config
 #
 GLOBAL_INJECTED_AAI1_IP_ADDR = "aai-service.onap-aai"
-#GLOBAL_INJECTED_AAI2_IP_ADDR = "N/A"
+GLOBAL_INJECTED_AAI2_IP_ADDR = "N/A"
 GLOBAL_INJECTED_APPC_IP_ADDR = "sdnhost.onap-appc"
 GLOBAL_INJECTED_ARTIFACTS_VERSION = "1.1.0-SNAPSHOT"
 GLOBAL_INJECTED_CLAMP_IP_ADDR = "clamp.onap-clamp"
@@ -28,6 +28,7 @@ GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR = "drools.onap-policy"
 GLOBAL_INJECTED_PORTAL_IP_ADDR = "portalapps.onap-portal"
 GLOBAL_INJECTED_REGION = "OPENSTACK_REGION_HERE"
 GLOBAL_INJECTED_REMOTE_REPO = "http://gerrit.onap.org/r/testsuite/properties.git"
+GLOBAL_INJECTED_SDC_IP_ADDR = "sdc-be.onap-sdc"
 GLOBAL_INJECTED_SDC_FE_IP_ADDR = "sdc-fe.onap-sdc"
 GLOBAL_INJECTED_SDC_BE_IP_ADDR = "sdc-be.onap-sdc"
 GLOBAL_INJECTED_SDNC_IP_ADDR = "sdnhost.onap-sdnc"

diff --git a/kubernetes/config/onap-parameters-sample.yaml b/kubernetes/config/onap-parameters-sample.yaml
index 081bc9d..51d5138 100644 (file)
--- a/kubernetes/config/onap-parameters-sample.yaml
+++ b/kubernetes/config/onap-parameters-sample.yaml
@@ -10,6 +10,6 @@ OPENSTACK_TENANT_ID: "47899782ed714295b1151681fdfd51f5"
 OPENSTACK_REGION: "RegionOne"
 OPENSTACK_KEYSTONE_URL: "http://1.2.3.4:5000"
 OPENSTACK_FLAVOUR_MEDIUM: "m1.medium"
-OPENSTACK_SERVICE_TENANT_NAME: "services"
+OPENSTACK_SERVICE_TENANT_NAME: "service"
 DMAAP_TOPIC: "AUTO"
 DEMO_ARTIFACTS_VERSION: "1.1.0-SNAPSHOT"

diff --git a/kubernetes/log/resources/logstash/pipeline/onap-pipeline.conf b/kubernetes/log/resources/logstash/pipeline/onap-pipeline.conf
index b425550..123ceb5 100644 (file)
--- a/kubernetes/log/resources/logstash/pipeline/onap-pipeline.conf
+++ b/kubernetes/log/resources/logstash/pipeline/onap-pipeline.conf
@@ -247,7 +247,7 @@ output {
 
  ######### Document configurations #########
 
- index => "onaplogs-%{+YYYY.MM.dd}"
+ index => "logstash-%{+YYYY.MM.dd}"
  document_type => "logs"
 
  ## This can be used to associate child documents with a parent using the parent ID.

diff --git a/kubernetes/robot/demo-k8s.sh b/kubernetes/robot/demo-k8s.sh
index a870972..2836fca 100755 (executable)
--- a/kubernetes/robot/demo-k8s.sh
+++ b/kubernetes/robot/demo-k8s.sh
@@ -124,4 +124,4 @@ done
 ETEHOME=/var/opt/OpenECOMP_ETE
 VARIABLEFILES="-V /share/config/vm_properties.py -V /share/config/integration_robot_properties.py -V /share/config/integration_preload_parameters.py"
 POD=$(kubectl --namespace onap-robot get pods | sed 's/ .*//'| grep robot)
-kubectl --namespace onap-robot exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d ${ETEHOME}/html/logs/demo/${TAG} -i ${TAG} --display 89 2> ${TAG}.out
+kubectl --namespace onap-robot exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/demo/${TAG} -i ${TAG} --display 89 2> ${TAG}.out

diff --git a/kubernetes/robot/ete-k8s.sh b/kubernetes/robot/ete-k8s.sh
index 26eedc9..2305a58 100755 (executable)
--- a/kubernetes/robot/ete-k8s.sh
+++ b/kubernetes/robot/ete-k8s.sh
@@ -20,4 +20,4 @@ VARIABLES="-v GLOBAL_BUILD_NUMBER:$$"
 #docker exec openecompete_container ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/${OUTPUT_FOLDER} ${TAGS} --display 88
 
 POD=$(kubectl --namespace onap-robot get pods | sed 's/ .*//'| grep robot)
-kubectl --namespace onap-robot exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d ${ETEHOME}/html/logs/ete/${OUTPUT_FOLDER} ${TAGS} --display 88
+kubectl --namespace onap-robot exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/${OUTPUT_FOLDER} ${TAGS} --display 88

diff --git a/kubernetes/vfc/templates/all-services.yaml b/kubernetes/vfc/templates/all-services.yaml
index cd3c9c9..98a0c4b 100755 (executable)
--- a/kubernetes/vfc/templates/all-services.yaml
+++ b/kubernetes/vfc/templates/all-services.yaml
@@ -117,6 +117,35 @@ spec:
 ---
 apiVersion: v1
 kind: Service
+metadata:
+  labels:
+    app: vfc-nokiavnfmdriver
+  name: vfc-nokiavnfmdriver
+  namespace: "{{ .Values.nsPrefix }}-vfc"
+  annotations:
+    msb.onap.org/service-info: '[
+      {
+          "serviceName": "nokiavnfmdriver",
+          "version": "v1",
+          "url": "/api/nokiavnfmdriver/v1",
+          "protocol": "REST",
+          "port": "{{.Values.nokiavnfmdriver.port}}",
+          "visualRange":"1"
+      }
+      ]'
+spec:
+  ports:
+  - name: vfc-nokiavnfmdriver
+    port: {{.Values.nokiavnfmdriver.port}}
+    nodePort: {{.Values.nokiavnfmdriver.nodePort}}
+  selector:
+    app: vfc-ztevmanagerdriver
+  type: NodePort
+#{{ end }}
+#{{ if not .Values.disableVfcNokiaVnfmDriver }}
+---
+apiVersion: v1
+kind: Service
 metadata:
   labels:
     app: vfc-hwvnfmdriver
@@ -345,6 +374,35 @@ spec:
     app: vfc-workflow
   type: NodePort
 #{{ end }}
+#{{ if not .Values.disableVfcVfcWorkflowEngineActiviti }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: vfc-workflowengineactiviti
+  name: vfc-workflowengineactiviti
+  namespace: "{{ .Values.nsPrefix }}-vfc"
+  annotations:
+    msb.onap.org/service-info: '[
+      {
+          "serviceName": "workflow",
+          "version": "v1",
+          "url": "/activiti-rest",
+          "protocol": "REST",
+          "port": "{{.Values.workflowengineactiviti.port}}",
+          "visualRange":"1"
+      }
+      ]'
+spec:
+  ports:
+  - name: vfc-workflow
+    port: {{.Values.workflowengineactiviti.port}}
+    nodePort: {{.Values.workflowengineactiviti.nodePort}}
+  selector:
+    app: vfc-workflow
+  type: NodePort
+#{{ end }}
 #{{ if not .Values.disableVfcVfcCatalog }}
 ---
 apiVersion: v1

diff --git a/kubernetes/vfc/templates/vfc-nokiavnfmdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-nokiavnfmdriver-deployment.yaml
new file mode 100755 (executable)
index 0000000..9a648ca
--- /dev/null
+++ b/kubernetes/vfc/templates/vfc-nokiavnfmdriver-deployment.yaml
@@ -0,0 +1,36 @@
+#{{ if not .Values.disableVfcNokiaVnfmDriver }}
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: vfc-nokiavnfmdriver
+  namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}"
+spec:
+  replicas: {{ .Values.nokiavnfmdriver.replicas }}
+  selector:
+    matchLabels:
+      app: vfc-nokiavnfmdriver
+  template:
+    metadata:
+      labels:
+        app: vfc-nokiavnfmdriver
+      name: vfc-nokiavnfmdriver
+    spec:
+      hostname: vfc-nokiavnfmdriver
+      containers:
+      - args:
+        image:  {{.Values.nokiavnfmdriver.image}}
+        name: "vfc-nokiavnfmdriver"
+        env:
+        - name: MSB_ADDR
+          value: {{ .Values.msbaddr }}
+        ports:
+        - containerPort: {{ .Values.nokiavnfmdriver.port }}
+        readinessProbe:
+          tcpSocket:
+            port: {{ .Values.nokiavnfmdriver.port }}
+          initialDelaySeconds: 5
+          periodSeconds: 10
+        imagePullPolicy: "{{ .Values.pullPolicy }}"
+      imagePullSecrets:
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file

diff --git a/kubernetes/vfc/templates/vfc-workflow-deployment.yaml b/kubernetes/vfc/templates/vfc-workflow-deployment.yaml
index 097986c..f19b55f 100755 (executable)
--- a/kubernetes/vfc/templates/vfc-workflow-deployment.yaml
+++ b/kubernetes/vfc/templates/vfc-workflow-deployment.yaml
@@ -21,8 +21,16 @@ spec:
         image:  {{.Values.workflow.image}}
         name: "vfc-workflow"
         env:
-        - name: MSB_ADDR
-          value: {{ .Values.msbaddr }}
+        - name: SERVICE_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
+        - name: SERVICE_PORT
+          value: "{{ .Values.workflow.port }}"
+        - name: OPENPALETTE_MSB_IP
+          value: msb-iag.{{ .Values.nsPrefix }}-msb
+        - name: OPENPALETTE_MSB_PORT
+          value: "80"
         ports:
         - containerPort: {{ .Values.workflow.port }}
         readinessProbe:

diff --git a/kubernetes/vfc/templates/vfc-workflow-engine-activity.yaml b/kubernetes/vfc/templates/vfc-workflow-engine-activity.yaml
new file mode 100755 (executable)
index 0000000..cb18ada
--- /dev/null
+++ b/kubernetes/vfc/templates/vfc-workflow-engine-activity.yaml
@@ -0,0 +1,44 @@
+#{{ if not .Values.disableVfcVfcWorkflowEngineActiviti }}
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: vfc-workflowengineactiviti
+  namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}"
+spec:
+  replicas: {{ .Values.workflowengineactiviti.replicas }}
+  selector:
+    matchLabels:
+      app: vfc-workflowengineactiviti
+  template:
+    metadata:
+      labels:
+        app: vfc-workflowengineactiviti
+      name: vfc-workflowengineactiviti
+    spec:
+      hostname: vfc-workflowengineactiviti
+      containers:
+      - args:
+        image:  {{.Values.workflowengineactiviti.image}}
+        name: "vfc-workflowengineactiviti"
+        env:
+        - name: SERVICE_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
+        - name: SERVICE_PORT
+          value: "{{ .Values.workflow.port }}"
+        - name: OPENPALETTE_MSB_IP
+          value: msb-iag.{{ .Values.nsPrefix }}-msb
+        - name: OPENPALETTE_MSB_PORT
+          value: "80"
+        ports:
+        - containerPort: {{ .Values.workflowengineactiviti.port }}
+        readinessProbe:
+          tcpSocket:
+            port: {{ .Values.workflowengineactiviti.port }}
+          initialDelaySeconds: 5
+          periodSeconds: 10
+        imagePullPolicy: "{{ .Values.pullPolicy }}"
+      imagePullSecrets:
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file

diff --git a/kubernetes/vfc/values.yaml b/kubernetes/vfc/values.yaml
index 94fcef8..fe5acd6 100644 (file)
--- a/kubernetes/vfc/values.yaml
+++ b/kubernetes/vfc/values.yaml
@@ -2,67 +2,77 @@ nsPrefix: onap
 pullPolicy: IfNotPresent
 msbaddr: msb-iag.onap-msb:80
 nslcm:
-  image: nexus3.onap.org:10001/onap/vfc/nslcm:latest
+  image: nexus3.onap.org:10001/onap/vfc/nslcm:v1.0.2
   port: 8403
   nodePort: 30403
   replicas: 1
 resmgr:
-  image: nexus3.onap.org:10001/onap/vfc/resmanagement:latest
+  image: nexus3.onap.org:10001/onap/vfc/resmanagement:v1.0.0
   port: 8480
   nodePort: 30480
   replicas: 1
 gvnfmdriver:
-  image: nexus3.onap.org:10001/onap/vfc/gvnfmdriver:latest
+  image: nexus3.onap.org:10001/onap/vfc/gvnfmdriver:v1.0.1
   port: 8484
   nodePort: 30484
   replicas: 1
 ztevmanagerdriver:
-  image: nexus3.onap.org:10001/onap/vfc/ztevmanagerdriver:latest
+  image: nexus3.onap.org:10001/onap/vfc/ztevmanagerdriver:v1.0.2
   port: 8410
   nodePort: 30410
   replicas: 1
 hwvnfmdriver:
-  image: nexus3.onap.org:10001/onap/vfc/nfvo/svnfm/huawei:latest
+  image: nexus3.onap.org:10001/onap/vfc/nfvo/svnfm/huawei:v1.0.2
   port: 8482
   nodePort: 30482
   replicas: 1
 ztesdncdriver:
-  image: nexus3.onap.org:10001/onap/vfc/ztesdncdriver:latest
+  image: nexus3.onap.org:10001/onap/vfc/ztesdncdriver:v1.0.0
   port: 8411
   nodePort: 30411
   replicas: 1
+nokiavnfmdriver:
+  image: nexus3.onap.org:10001/onap/vfc/nfvo/svnfm/nokia:v1.0.2
+  port: 8486
+  nodePort: 30412
+  replicas: 1
 jujudriver:
-  image: nexus3.onap.org:10001/onap/vfc/jujudriver:latest
+  image: nexus3.onap.org:10001/onap/vfc/jujudriver:v1.0.0
   port: 8483
   nodePort: 30483
   replicas: 1
 vnflcm:
-  image: nexus3.onap.org:10001/onap/vfc/vnflcm:latest
+  image: nexus3.onap.org:10001/onap/vfc/vnflcm:v1.0.1
   port: 8801
   nodePort: 30801
   replicas: 1
 vnfres:
-  image: nexus3.onap.org:10001/onap/vfc/vnfres:latest
+  image: nexus3.onap.org:10001/onap/vfc/vnfres:v1.0.1
   port: 8802
   nodePort: 30802
   replicas: 1
 vnfmgr:
-  image: nexus3.onap.org:10001/onap/vfc/vnfmgr:latest
+  image: nexus3.onap.org:10001/onap/vfc/vnfmgr:v1.0.1
   port: 8803
   nodePort: 30803
   replicas: 1
 emsdriver:
-  image: nexus3.onap.org:10001/onap/vfc/emsdriver:latest
+  image: nexus3.onap.org:10001/onap/vfc/emsdriver:v1.0.1
   port: 8206
   nodePort: 30296
   replicas: 1
 workflow:
-  image: nexus3.onap.org:10001/onap/vfc/wfenginemgrservice:latest
-  port: 8805
+  image: nexus3.onap.org:10001/onap/vfc/wfengine-mgrservice:v1.0.0
+  port: 10550
   nodePort: 30805
   replicas: 1
+workflowengineactiviti:
+  image: nexus3.onap.org:10001/onap/vfc/wfengine-activiti:v1.0.0
+  port: 8080
+  nodePort: 30807
+  replicas: 1
 catalog:
-  image: nexus3.onap.org:10001/onap/vfc/catalog:latest
+  image: nexus3.onap.org:10001/onap/vfc/catalog:v1.0.2
   port: 8806
   nodePort: 30806
   replicas: 1
\ No newline at end of file

diff --git a/kubernetes/vid/templates/vid-server-deployment.yaml b/kubernetes/vid/templates/vid-server-deployment.yaml
index d015135..1c03218 100644 (file)
--- a/kubernetes/vid/templates/vid-server-deployment.yaml
+++ b/kubernetes/vid/templates/vid-server-deployment.yaml
@@ -59,7 +59,7 @@ spec:
         - name: VID_MSO_SERVER_URL
           value: http://mso.{{ .Values.nsPrefix }}-mso:8080
         - name: VID_MSO_PASS
-          value: 51515201a8d4c5c08d533db9bd1e1a9b
+          value: OBF:1ih71i271vny1yf41ymf1ylz1yf21vn41hzj1icz
         - name: MSO_DME2_SERVER_URL
           value: http://localhost:8081
         - name: MSO_DME2_ENABLED