Merge branch 'develop' of github.com:pndaproject/platform-deployment-manager into RELEASE-0.4.0

Author: jgarnier

api/src/main/resources/plugins/sparkStreaming.py

@@ -132,6 +132,8 @@ def create_component(self, staged_component_path, application_name, component, p
                                     ['sudo mkdir -p %s' % remote_component_install_path,
                                      'sudo mv %s %s' % (remote_component_tmp_path + '/log4j.properties', remote_component_install_path + '/log4j.properties')])
 
+        if 'component_main_py' in properties:
+            main_jar_name = None
         if 'component_main_jar' in properties:
             main_jar_name = properties['component_main_jar']
         else:
@@ -141,7 +143,8 @@ def create_component(self, staged_component_path, application_name, component, p
         commands.append('sudo cp %s/%s %s' % (remote_component_tmp_path, service_script, service_script_install_path))
         commands.append('sudo cp %s/* %s' % (remote_component_tmp_path, remote_component_install_path))
         commands.append('sudo chmod a+x %s/yarn-kill.py' % (remote_component_install_path))
-        commands.append('cd %s && sudo jar uf %s application.properties' % (remote_component_install_path, main_jar_name))
+        if main_jar_name is not None:
+            commands.append('cd %s && sudo jar uf %s application.properties' % (remote_component_install_path, main_jar_name))
         commands.append('sudo rm -rf %s' % (remote_component_tmp_path))
         deployer_utils.exec_ssh(target_host, root_user, key_file, commands)
 

api/src/main/resources/plugins/upstart.conf.py.tpl

@@ -4,6 +4,5 @@ respawn
 respawn limit unlimited
 pre-start exec /opt/${environment_namespace}/${component_application}/${component_name}/yarn-kill.py
 pre-stop exec /opt/${environment_namespace}/${component_application}/${component_name}/yarn-kill.py
-env programDir=/opt/${environment_namespace}/${component_application}/${component_name}/
 chdir /opt/${environment_namespace}/${component_application}/${component_name}/
-exec sudo -u hdfs spark-submit --driver-java-options "-Dlog4j.configuration=file:///${programDir}log4j.properties" --conf 'spark.executor.extraJavaOptions=-Dlog4j.configuration=file:///${programDir}log4j.properties' --name '${component_job_name}' --master yarn-cluster --py-files application.properties,${component_py_files} ${component_spark_submit_args} ${component_main_py}
+exec sudo -u hdfs spark-submit --driver-java-options "-Dlog4j.configuration=file:///opt/${environment_namespace}/${component_application}/${component_name}/log4j.properties" --conf 'spark.executor.extraJavaOptions=-Dlog4j.configuration=file:///opt/${environment_namespace}/${component_application}/${component_name}/log4j.properties' --name '${component_job_name}' --master yarn-cluster --py-files application.properties,${component_py_files} ${component_spark_submit_args} ${component_main_py}