fixed merge error in setup.py, fixed error in telegraf instdall script

scripts/clmc-agent/configure.sh

@@ -51,17 +51,19 @@ TELEGRAF_CONF_FILE=$TELEGRAF_CONF_DIR"/telegraf.conf"
 TELEGRAF_INCLUDE_CONF_DIR=$TELEGRAF_CONF_DIR"/telegraf.d"
 TELEGRAF_OUTPUT_CONF_FILE=$TELEGRAF_INCLUDE_CONF_DIR"/telegraf_output.conf"
 
-cat TELEGRAF_OUTPUT_CONF_FILE
+echo "Telegraf Configuration File: ${TELEGRAF_CONF_FILE}"
 
 # Replace template parameters on general configuration
 sed -i 's/$LOCATION/'$LOCATION'/g' $TELEGRAF_CONF_FILE
 sed -i 's/$SFC_ID/'$SFC_ID'/g' $TELEGRAF_CONF_FILE
 sed -i 's/$SFC_ID_INSTANCE/'$SFC_ID_INSTANCE'/g' $TELEGRAF_CONF_FILE
-sed -i 's/$SF_ID/'$SF_ID'/g' /etc/telegraf/telegraf.conf
+sed -i 's/$SF_ID/'$SF_ID'/g' $TELEGRAF_CONF_FILE
 sed -i 's/$SF_ID_INSTANCE}}/'$SF_ID_INSTANCE'/g' $TELEGRAF_CONF_FILE
 sed -i 's/$IP_ENDPOINT_ID/'$IP_ENDPOINT_ID'/g' $TELEGRAF_CONF_FILE
 sed -i 's/$SR_ID/'$SR_ID'/g' $TELEGRAF_CONF_FILE
 
+echo "Telegraf Output Configuration File: ${TELEGRAF_OUTPUT_CONF_FILE}"
+
 # Replace parameters in output configuration file
 sed -i 's|$INFLUXDB_URL|'$INFLUXDB_URL'|g' $TELEGRAF_OUTPUT_CONF_FILE
 sed -i 's/$DATABASE_NAME/'$DATABASE_NAME'/g' $TELEGRAF_OUTPUT_CONF_FILE
\ No newline at end of file

setup.py

@@ -21,12 +21,9 @@
 //      Created for Project :   FLAME
 """
 
-<<<<<<< HEAD
-=======
 
 import os
 import os.path
->>>>>>> 478adc7ea66ad80c634766768a19a1fa205d82ea
 from setuptools import setup, find_packages