From eeabacda9792d41642c24b2771d641eea67558b5 Mon Sep 17 00:00:00 2001 From: Carsten Lund Date: Thu, 16 Mar 2017 21:04:58 +0000 Subject: [DCAE-8] Fix for version issues with tca. Change-Id: I05f9ca10163ac71c88711f1b1c17638197a096ca Signed-off-by: Carsten Lund --- OPENECOMP-DEMO/cdap-templates/cdap-tca-hi-lo.yaml | 2 +- OPENECOMP-DEMO/vm-descriptors/vm-cdap-cluster.json | 1 - OPENECOMP-DEMO/vm-descriptors/vm-docker-host-1.json | 1 - OPENECOMP-DEMO/vm-descriptors/vm-postgresql.json | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/OPENECOMP-DEMO/cdap-templates/cdap-tca-hi-lo.yaml b/OPENECOMP-DEMO/cdap-templates/cdap-tca-hi-lo.yaml index cc206da..c6d0efa 100644 --- a/OPENECOMP-DEMO/cdap-templates/cdap-tca-hi-lo.yaml +++ b/OPENECOMP-DEMO/cdap-templates/cdap-tca-hi-lo.yaml @@ -13,7 +13,7 @@ controller-instance-configuration: } apps: dcae-tca: - jarFile: /opt/app/cdap-apps/dcae-analytics-tca-1.0.0-SNAPSHOT.jar + jarFile: /opt/app/cdap-apps/dcae-analytics-tca-${dcae.env('open-ecomp-demo.versions.apod')}.jar artifactName: dcae-analytics-tca version: 1.0.0 appConfigFileContent: '{config:{ diff --git a/OPENECOMP-DEMO/vm-descriptors/vm-cdap-cluster.json b/OPENECOMP-DEMO/vm-descriptors/vm-cdap-cluster.json index 5537ab5..8fdcdc8 100644 --- a/OPENECOMP-DEMO/vm-descriptors/vm-cdap-cluster.json +++ b/OPENECOMP-DEMO/vm-descriptors/vm-cdap-cluster.json @@ -2,7 +2,6 @@ $class : "org.openecomp.dcae.controller.service.vm.VirtualMachineServiceDescriptor", groupId : "org.openecomp.dcae.controller", artifact : "dcae-controller-service-cdap-cluster", - version : "0.1.0-SNAPSHOT", servicePackage : "org.openecomp.dcae.controller.service.cdap.cluster.service", serviceClass : "CdapClusterService", serviceInstanceClass : "CdapClusterServiceInstance", diff --git a/OPENECOMP-DEMO/vm-descriptors/vm-docker-host-1.json b/OPENECOMP-DEMO/vm-descriptors/vm-docker-host-1.json index 90d7bba..ef36a79 100644 --- a/OPENECOMP-DEMO/vm-descriptors/vm-docker-host-1.json +++ b/OPENECOMP-DEMO/vm-descriptors/vm-docker-host-1.json @@ -2,7 +2,6 @@ $class : "org.openecomp.dcae.controller.service.vm.VirtualMachineServiceDescriptor", groupId : "org.openecomp.dcae.controller", artifact : "dcae-controller-service-docker-host", - version : "0.1.0-SNAPSHOT", servicePackage : "org.openecomp.dcae.controller.service.docker.host.service", serviceClass : "DockerHostService", serviceInstanceClass : "DockerHostServiceInstance", diff --git a/OPENECOMP-DEMO/vm-descriptors/vm-postgresql.json b/OPENECOMP-DEMO/vm-descriptors/vm-postgresql.json index 45d7623..0643455 100644 --- a/OPENECOMP-DEMO/vm-descriptors/vm-postgresql.json +++ b/OPENECOMP-DEMO/vm-descriptors/vm-postgresql.json @@ -2,7 +2,6 @@ $class : "org.openecomp.dcae.controller.service.vm.VirtualMachineServiceDescriptor", groupId : "org.openecomp.dcae.controller", artifact : "dcae-controller-service-common-vm", - version : "0.1.0-SNAPSHOT", servicePackage : "org.openecomp.dcae.controller.service.common.vm.service", serviceClass : "CommonVmService", serviceInstanceClass : "CommonVmServiceInstance", -- cgit 1.2.3-korg