Merge "Adjust appc to latest (Amsterdam)" into release-1.1.0

3 files changed, 11 insertions, 11 deletions

diff --git a/kubernetes/appc/templates/dgbuilder-deployment.yaml b/kubernetes/appc/templates/dgbuilder-deployment.yaml
index b9495a740b..32ccdafc3b 100644
--- 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 624c6421d2..882267c41d 100644
--- 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/config/docker/init/src/config/appc/conf/appc.properties b/kubernetes/config/docker/init/src/config/appc/conf/appc.properties
index 2b27ed20b7..3ac5aaee0b 100644
--- 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