Minor script fixes/improvements

Change-Id: I9e8da01ff2d6a94bb1fb0f64dc660ec0a49f63b6
Signed-off-by: juraj.linkes <jlinkes@cisco.com>

diff --git a/scripts/install_odl.sh b/scripts/install_odl.sh
index 3067a25..01eefc7 100755 (executable)
--- a/scripts/install_odl.sh
+++ b/scripts/install_odl.sh
@@ -7,8 +7,7 @@ INSTALL_DIR=/opt
 ODL_DIR=$INSTALL_DIR/opendaylight
 ODL_TGZ_NAME=$1
 cp $ODL_DIR/etc/jetty.xml $INSTALL_DIR
-cp $ODL_DIR/etc/org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.startup.cfg $INSTALL_DIR
-cp $ODL_DIR/etc/org.opendaylight.groupbasedpolicy.renderer.vpp.startup.cfg $INSTALL_DIR
+cp $ODL_DIR/etc/org.opendaylight.groupbasedpolicy.* $INSTALL_DIR
 rm -rf $ODL_DIR
 #mv opendaylight orig_opendaylight
 ODL_DEFAULT_DIR_NAME=$(tar tf $ODL_TGZ_NAME | head -n1 | cut -d "/" -f 1)
@@ -19,8 +18,7 @@ mv $INSTALL_DIR/$ODL_DEFAULT_DIR_NAME $INSTALL_DIR/opendaylight
 #CHANGE PORT AND CONFIGURE:
 echo "$HOSTNAME: configuring odl"
 cp $INSTALL_DIR/jetty.xml $ODL_DIR/etc/
-cp $INSTALL_DIR/org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.startup.cfg $ODL_DIR/etc/
-cp $INSTALL_DIR/org.opendaylight.groupbasedpolicy.renderer.vpp.startup.cfg $ODL_DIR/etc/
+cp $INSTALL_DIR/org.opendaylight.groupbasedpolicy.* $ODL_DIR/etc/
 
 #CONFIGURE LOGGING:
 sed -i 's/log4j.appender.out.maxFileSize=.*/log4j.appender.out.maxFileSize=100MB/' $ODL_DIR/etc/org.ops4j.pax.logging.cfg

diff --git a/scripts/resource_cleanup.sh b/scripts/resource_cleanup.sh
index 433f73b..fe37188 100755 (executable)
--- a/scripts/resource_cleanup.sh
+++ b/scripts/resource_cleanup.sh
@@ -119,14 +119,14 @@ clean_from_jumphost() {
             # if controller node and controller queue exist, execute on that node
             echo "Cleaning $NODE"
             ssh -oStrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null root@$NODE \
-                "$overcloud_script_loc/$0 -n controller $CONTROLLER_QUEUE" &
+                "$overcloud_script_loc/$(basename $0) -n controller $CONTROLLER_QUEUE" &
         fi
         if [[ $NODE == *"compute"* && $COMPUTE_QUEUE ]]
         then
             # if compute node and compute queue exist, execute on that node
             echo "Cleaning $NODE"
             ssh -oStrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null root@$NODE \
-                "$overcloud_script_loc/$0 -n compute $COMPUTE_QUEUE" &
+                "$overcloud_script_loc/$(basename $0) -n compute $COMPUTE_QUEUE" &
         fi
     done