diff options
| author |   Carsten Lund <lund@research.att.com> | 2017-05-02 02:14:33 +0000 |
|---|---|---|
| committer | Carsten Lund <lund@research.att.com> | 2017-05-02 15:08:12 +0000 |
| commit | 8fc1dbd5956a1e20b8b576cee791271bc3e7c283 (patch) | |
| tree | 1fe4fd3209616faaf751c61c09ece0569b9973b1 /dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/server/bin/manager.sh | |
| parent | ec3b44f64b4890694a0f3a1976182f730e268e1f (diff) | |
[DCAE-15] Changes related to version 1.1 (2)
Change-Id: I52fefc397f789b56095f037acc517b364516b2cb
Signed-off-by: Carsten Lund <lund@research.att.com>
Diffstat (limited to 'dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/server/bin/manager.sh')
| -rw-r--r-- | dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/server/bin/manager.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/server/bin/manager.sh b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/server/bin/manager.sh index 4bf41b1..f20ffd9 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/server/bin/manager.sh +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/server/bin/manager.sh @@ -22,9 +22,13 @@ VMTYPE=$(ls /tmp/vm-*manager.properties | sed s/-manager.properties// | sed sx/t case $CMD1 in start) CLUSTER_FILE=data/resources/cluster.json + if [ -e config/version.json ]; then + rm -rf data/resources/configuration/version* + cp config/version.json data/resources/configuration/ + fi if [ ! -e $CLUSTER_FILE ]; then mkdir -p $(dirname $CLUSTER_FILE) - echo '{ "baseUrl": "http://localhost:10000/v3", "pollingFrequency": "30000" }' > $CLUSTER_FILE + echo '{ "baseUrl": "http://localhost:10000/v3", "pollingFrequency": "30000", "$version": "ONAP-R2" }' > $CLUSTER_FILE fi JVMARGS=$(cat config/manager.properties | grep JVMARGS | sed 's/[^=]*=//') $CMD $CMD1 $JVMARGS |