Merge pull request #74 from pndaproject/PNDA-4525

Deprecate Ubuntu 14.04

Author: jgarnier

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

@@ -70,7 +70,6 @@ def _control_component(self, cmds):
     def create_component(self, staged_component_path, application_name, user_name, component, properties):
         logging.debug("create_component: %s %s %s %s", application_name, user_name, json.dumps(component), properties)
         distro = platform.dist()
-        usesSystemd = distro[0] in ('redhat', 'centos')
         remote_component_tmp_path = '%s/%s/%s' % (
             '/tmp/%s' % self._namespace, application_name, component['component_name'])
         remote_component_install_path = '%s/%s/%s' % (
@@ -108,12 +107,8 @@ def create_component(self, staged_component_path, application_name, user_name, c
 
             this_dir = os.path.dirname(os.path.realpath(__file__))
             copy(os.path.join(this_dir, 'yarn-kill.py'), staged_component_path)
-            if usesSystemd:
-                service_script = 'systemd.service.tpl' if java_app else 'systemd.service.py.tpl'
-                service_script_install_path = '/usr/lib/systemd/system/%s.service' % service_name
-            else:
-                service_script = 'upstart.conf.tpl' if java_app else 'upstart.conf.py.tpl'
-                service_script_install_path = '/etc/init/%s.conf' % service_name
+            service_script = 'systemd.service.tpl' if java_app else 'systemd.service.py.tpl'
+            service_script_install_path = '/usr/lib/systemd/system/%s.service' % service_name
             copy(os.path.join(this_dir, service_script), staged_component_path)
 
         self._fill_properties(os.path.join(staged_component_path, service_script), properties)
@@ -153,8 +148,7 @@ def create_component(self, staged_component_path, application_name, user_name, c
         logging.debug("uninstall commands: %s", undo_commands)
 
         start_commands = []
-        if usesSystemd:
-            start_commands.append('sudo systemctl daemon-reload\n')
+        start_commands.append('sudo systemctl daemon-reload\n')
         start_commands.append('sudo service %s start\n' % service_name)
         logging.debug("start commands: %s", start_commands)
 

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

@@ -193,7 +193,7 @@ def json(self):
                 return {'id': 'someid'}
 
         post_mock.return_value = Resp()
-        dist_mock.return_value = 'ubuntu'
+        dist_mock.return_value = 'redhat'
         cmd_mock.return_value = (0, 'dev')
         with patch("__builtin__.open", mock_open(read_data="[]")):
             creator = ApplicationCreator(self.config, self.environment, self.service)
@@ -211,7 +211,7 @@ def json(self):
         exec_ssh_mock.assert_any_call('nm1', 'root_user', 'keyfile.pem', ['sudo mkdir -p /opt/ns/aname/componentC', 'sudo mv /tmp/ns/aname/componentC/log4j.properties /opt/ns/aname/componentC/log4j.properties'])
         exec_ssh_mock.assert_any_call('nm2', 'root_user', 'keyfile.pem', ['mkdir -p /tmp/ns/aname/componentC'])
         exec_ssh_mock.assert_any_call('nm2', 'root_user', 'keyfile.pem', ['sudo mkdir -p /opt/ns/aname/componentC', 'sudo mv /tmp/ns/aname/componentC/log4j.properties /opt/ns/aname/componentC/log4j.properties'])
-        exec_ssh_mock.assert_any_call('localhost', 'root_user', 'keyfile.pem', ['sudo cp /tmp/ns/aname/componentC/upstart.conf.tpl /etc/init/ns-aname-componentC.conf', 'sudo cp /tmp/ns/aname/componentC/* /opt/ns/aname/componentC', 'sudo chmod a+x /opt/ns/aname/componentC/yarn-kill.py', 'cd /opt/ns/aname/componentC && sudo jar uf abc.jar application.properties', 'sudo rm -rf /tmp/ns/aname/componentC'])
+        exec_ssh_mock.assert_any_call('localhost', 'root_user', 'keyfile.pem', ['sudo cp /tmp/ns/aname/componentC/systemd.service.tpl /usr/lib/systemd/system/ns-aname-componentC.service', 'sudo cp /tmp/ns/aname/componentC/* /opt/ns/aname/componentC', 'sudo chmod a+x /opt/ns/aname/componentC/yarn-kill.py', 'cd /opt/ns/aname/componentC && sudo jar uf abc.jar application.properties', 'sudo rm -rf /tmp/ns/aname/componentC'])
 
     @patch('starbase.Connection')
     @patch('pyhs2.connect')