diff options
Diffstat (limited to 'dcae-controller-service-vm')
2 files changed, 2 insertions, 2 deletions
diff --git a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/server/bin/manager.sh b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/server/bin/manager.sh index 0f1cf2d..972c011 100644 --- a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/server/bin/manager.sh +++ b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/server/bin/manager.sh @@ -20,7 +20,7 @@ VMTYPE=$(ls /tmp/vm-*manager.properties | sed s/-manager.properties// | sed sx/t case $CMD1 in start) umask 022 - for jar in /opt/app/{ncomp,dcae}-*-model/lib/*jar; do cp -p $jar lib/; done +for jar in /opt/app/{ncomp,dcae}-*-{model,jars}/lib/*jar; do cp -p $jar lib/; done JVMARGS=$(cat config/manager.properties | grep JVMARGS | sed 's/[^=]*=//') $CMD $CMD1 $JVMARGS ;; diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/vm/DcaeVirtualMachineServiceProvider.java b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/vm/DcaeVirtualMachineServiceProvider.java index b5be627..2f9e39b 100644 --- a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/vm/DcaeVirtualMachineServiceProvider.java +++ b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/vm/DcaeVirtualMachineServiceProvider.java @@ -110,7 +110,7 @@ public class DcaeVirtualMachineServiceProvider extends BasicAdaptorProvider { throw new RuntimeException("Unable to find container object: " + containerPath); } if (!(s.o instanceof DcaeLocation)) - throw new RuntimeException("Unable to deploy to this container: " + containerPath + " " + s.o); + throw new RuntimeException("Unable to deploy to this non location container: " + containerPath); i.setLocation((DcaeLocation) s.o); } DcaeLocation location = i.getLocation(); |