summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Lund <lund@research.att.com>2017-03-16 01:47:06 +0000
committerCarsten Lund <lund@research.att.com>2017-03-16 01:47:59 +0000
commitf098464197b977b9062adc77d68b28aaae5d200b (patch)
tree8e57b30f9ba445479b5af89b304c1e9ffda285c7
parent21ffe918eb10c36ab3b26410b6b0139e1792fc7e (diff)
[DCAE-8] fixed hardcoded version in tca yaml
Change-Id: I96602b0120dfda9453c95f117cf5eb757ce4cab6 Signed-off-by: Carsten Lund <lund@research.att.com>
-rw-r--r--OPENECOMP-DEMO/cdap-templates/cdap-tca-hi-lo.yaml2
-rw-r--r--OPENECOMP-DEMO/vm-descriptors/vm-cdap-cluster.json1
-rw-r--r--OPENECOMP-DEMO/vm-descriptors/vm-docker-host-1.json1
-rw-r--r--OPENECOMP-DEMO/vm-descriptors/vm-postgresql.json1
4 files changed, 1 insertions, 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",