Merge "Remove sysvinit/upstart support"

Author: Zuul

elements/amphora-agent/install.d/amphora-agent-source-install/75-amphora-agent-install

@@ -41,18 +41,10 @@ mkdir -p /var/lib/octavia
 install -D -g root -o root -m 0644 ${SCRIPTDIR}/amphora-agent.logrotate /etc/logrotate.d/amphora-agent
 
 case "$DIB_INIT_SYSTEM" in
-    upstart)
-        install -D -g root -o root -m 0644 ${SCRIPTDIR}/amphora-agent.conf /etc/init/amphora-agent.conf
-        install -D -g root -o root -m 0644 ${SCRIPTDIR}/prometheus-proxy.conf /etc/init/prometheus-proxy.conf
-        ;;
     systemd)
         install -D -g root -o root -m 0644 ${SCRIPTDIR}/amphora-agent.service /usr/lib/systemd/system/amphora-agent.service
         install -D -g root -o root -m 0644 ${SCRIPTDIR}/prometheus-proxy.service /usr/lib/systemd/system/prometheus-proxy.service
         ;;
-    sysv)
-        install -D -g root -o root -m 0644 ${SCRIPTDIR}/amphora-agent.init /etc/init.d/amphora-agent.init
-        install -D -g root -o root -m 0644 ${SCRIPTDIR}/prometheus-proxy.init /etc/init.d/prometheus-proxy.init
-        ;;
     *)
         echo "Unsupported init system"
         exit 1

elements/certs-ramfs/init-scripts/sysv/certs-ramfs

@@ -7,10 +7,6 @@ set -eu
 set -o pipefail
 
 case "$DIB_INIT_SYSTEM" in
-    upstart|sysv)
-        # nothing to do
-        exit 0
-        ;;
     systemd)
         systemctl enable certs-ramfs.service
         ;;

elements/certs-ramfs/init-scripts/upstart/certs-ramfs.conf

@@ -52,8 +52,6 @@ def build_agent_config(self, amphora_id, topology):
              'haproxy_cmd': CONF.haproxy_amphora.haproxy_cmd,
              'heartbeat_interval': CONF.health_manager.heartbeat_interval,
              'heartbeat_key': CONF.health_manager.heartbeat_key,
-             'respawn_count': CONF.haproxy_amphora.respawn_count,
-             'respawn_interval': CONF.haproxy_amphora.respawn_interval,
              'amphora_udp_driver': CONF.amphora_agent.amphora_udp_driver,
              'agent_tls_protocol': CONF.amphora_agent.agent_tls_protocol,
              'topology': topology,

elements/certs-ramfs/post-install.d/30-enable-certs-ramfs-service

@@ -34,8 +34,6 @@
 
 j2_env = jinja2.Environment(autoescape=True, loader=jinja2.FileSystemLoader(
     os.path.dirname(os.path.realpath(__file__)) + consts.AGENT_API_TEMPLATES))
-UPSTART_TEMPLATE = j2_env.get_template(consts.KEEPALIVED_JINJA2_UPSTART)
-SYSVINIT_TEMPLATE = j2_env.get_template(consts.KEEPALIVED_JINJA2_SYSVINIT)
 SYSTEMD_TEMPLATE = j2_env.get_template(consts.KEEPALIVED_JINJA2_SYSTEMD)
 check_script_template = j2_env.get_template(consts.CHECK_SCRIPT_CONF)
 
@@ -60,34 +58,17 @@ def upload_keepalived_config(self):
                 f.write(b)
                 b = stream.read(BUFFER)
 
-        init_system = util.get_os_init_system()
-
-        file_path = util.keepalived_init_path(init_system)
-
-        init_enable_cmd = None
-        if init_system == consts.INIT_SYSTEMD:
-            template = SYSTEMD_TEMPLATE
-            init_enable_cmd = "systemctl enable octavia-keepalived"
-
-            # Render and install the network namespace systemd service
-            util.install_netns_systemd_service()
-            util.run_systemctl_command(
-                consts.ENABLE, consts.AMP_NETNS_SVC_PREFIX)
-        elif init_system == consts.INIT_UPSTART:
-            template = UPSTART_TEMPLATE
-        elif init_system == consts.INIT_SYSVINIT:
-            template = SYSVINIT_TEMPLATE
-            init_enable_cmd = f"insserv {file_path}"
-        else:
-            raise util.UnknownInitError()
-
-        if init_system == consts.INIT_SYSTEMD:
-            # mode 00644
-            mode = stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IROTH
-        else:
-            # mode 00755
-            mode = (stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP |
-                    stat.S_IROTH | stat.S_IXOTH)
+        file_path = util.keepalived_init_path()
+
+        template = SYSTEMD_TEMPLATE
+
+        # Render and install the network namespace systemd service
+        util.install_netns_systemd_service()
+        util.run_systemctl_command(
+            consts.ENABLE, consts.AMP_NETNS_SVC_PREFIX, False)
+
+        # mode 00644
+        mode = stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IROTH
         if not os.path.exists(file_path):
             with os.fdopen(os.open(file_path, flags, mode), 'w') as text_file:
                 text = template.render(
@@ -118,17 +99,13 @@ def upload_keepalived_config(self):
         util.vrrp_check_script_update(None, consts.AMP_ACTION_START)
 
         # Make sure the new service is enabled on boot
-        if init_enable_cmd is not None:
-            try:
-                subprocess.check_output(init_enable_cmd.split(),
-                                        stderr=subprocess.STDOUT,
-                                        encoding='utf-8')
-            except subprocess.CalledProcessError as e:
-                LOG.debug('Failed to enable octavia-keepalived service: '
-                          '%(err)s %(output)s', {'err': e, 'output': e.output})
-                return webob.Response(json={
-                    'message': "Error enabling octavia-keepalived service",
-                    'details': e.output}, status=500)
+        try:
+            util.run_systemctl_command(consts.ENABLE,
+                                       consts.KEEPALIVED_SYSTEMD)
+        except subprocess.CalledProcessError as e:
+            return webob.Response(json={
+                'message': "Error enabling octavia-keepalived service",
+                'details': e.output}, status=500)
 
         res = webob.Response(json={'message': 'OK'}, status=200)
         res.headers['ETag'] = stream.get_md5()
@@ -158,14 +135,10 @@ def manager_keepalived_service(self, action):
             except OSError:
                 pass
 
-        cmd = f"/usr/sbin/service octavia-keepalived {action}"
-
         try:
-            subprocess.check_output(cmd.split(), stderr=subprocess.STDOUT,
-                                    encoding='utf-8')
+            util.run_systemctl_command(action,
+                                       consts.KEEPALIVED_SYSTEMD)
         except subprocess.CalledProcessError as e:
-            LOG.debug('Failed to %s octavia-keepalived service: %s %s',
-                      action, e, e.output)
             return webob.Response(json={
                 'message': f"Failed to {action} octavia-keepalived service",
                 'details': e.output}, status=500)

octavia/amphorae/backends/agent/agent_jinja_cfg.py

@@ -38,8 +38,6 @@
 
 j2_env = jinja2.Environment(autoescape=True, loader=jinja2.FileSystemLoader(
     os.path.dirname(os.path.realpath(__file__)) + consts.AGENT_API_TEMPLATES))
-UPSTART_TEMPLATE = j2_env.get_template(consts.KEEPALIVED_JINJA2_UPSTART)
-SYSVINIT_TEMPLATE = j2_env.get_template(consts.KEEPALIVED_JINJA2_SYSVINIT)
 SYSTEMD_TEMPLATE = j2_env.get_template(consts.KEEPALIVED_JINJA2_SYSTEMD)
 check_script_file_template = j2_env.get_template(
     consts.KEEPALIVED_CHECK_SCRIPT)
@@ -92,32 +90,18 @@ def upload_lvs_listener_config(self, listener_id):
                 f.write(b)
                 b = stream.read(BUFFER)
 
-        init_system = util.get_os_init_system()
+        file_path = util.keepalived_lvs_init_path(listener_id)
 
-        file_path = util.keepalived_lvs_init_path(init_system, listener_id)
+        template = SYSTEMD_TEMPLATE
 
-        if init_system == consts.INIT_SYSTEMD:
-            template = SYSTEMD_TEMPLATE
-
-            # Render and install the network namespace systemd service
-            util.install_netns_systemd_service()
-            util.run_systemctl_command(
-                consts.ENABLE, consts.AMP_NETNS_SVC_PREFIX)
-        elif init_system == consts.INIT_UPSTART:
-            template = UPSTART_TEMPLATE
-        elif init_system == consts.INIT_SYSVINIT:
-            template = SYSVINIT_TEMPLATE
-        else:
-            raise util.UnknownInitError()
+        # Render and install the network namespace systemd service
+        util.install_netns_systemd_service()
+        util.run_systemctl_command(
+            consts.ENABLE, consts.AMP_NETNS_SVC_PREFIX, False)
 
         # Render and install the keepalivedlvs init script
-        if init_system == consts.INIT_SYSTEMD:
-            # mode 00644
-            mode = stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IROTH
-        else:
-            # mode 00755
-            mode = (stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP |
-                    stat.S_IROTH | stat.S_IXOTH)
+        # mode 00644
+        mode = stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IROTH
         keepalived_pid, vrrp_pid, check_pid = util.keepalived_lvs_pids_path(
             listener_id)
         if not os.path.exists(file_path):
@@ -136,23 +120,15 @@ def upload_lvs_listener_config(self, listener_id):
                 text_file.write(text)
 
         # Make sure the keepalivedlvs service is enabled on boot
-        if init_system == consts.INIT_SYSTEMD:
+        try:
             util.run_systemctl_command(
-                consts.ENABLE, f"octavia-keepalivedlvs-{str(listener_id)}")
-        elif init_system == consts.INIT_SYSVINIT:
-            init_enable_cmd = f"insserv {file_path}"
-            try:
-                subprocess.check_output(init_enable_cmd.split(),
-                                        stderr=subprocess.STDOUT,
-                                        encoding='utf-8')
-            except subprocess.CalledProcessError as e:
-                LOG.debug('Failed to enable '
-                          'octavia-keepalivedlvs service: '
-                          '%(err)s', {'err': str(e)})
-                return webob.Response(json={
-                    'message': ("Error enabling "
-                                "octavia-keepalivedlvs service"),
-                    'details': e.output}, status=500)
+                consts.ENABLE,
+                consts.KEEPALIVEDLVS_SYSTEMD % listener_id)
+        except subprocess.CalledProcessError as e:
+            return webob.Response(json={
+                'message': ("Error enabling "
+                            "octavia-keepalivedlvs service"),
+                'details': e.output}, status=500)
 
         if NEED_CHECK:
             # inject the check script for keepalived process
@@ -166,7 +142,6 @@ def upload_lvs_listener_config(self, listener_id):
                                'w') as script_file:
                     text = check_script_file_template.render(
                         consts=consts,
-                        init_system=init_system,
                         keepalived_lvs_pid_dir=util.keepalived_lvs_dir()
                     )
                     script_file.write(text)
@@ -217,15 +192,10 @@ def manage_lvs_listener(self, listener_id, action):
             if consts.OFFLINE == self._check_lvs_listener_status(listener_id):
                 action = consts.AMP_ACTION_START
 
-        cmd = ("/usr/sbin/service "
-               f"octavia-keepalivedlvs-{listener_id} {action}")
-
         try:
-            subprocess.check_output(cmd.split(), stderr=subprocess.STDOUT,
-                                    encoding='utf-8')
+            util.run_systemctl_command(
+                action, consts.KEEPALIVEDLVS_SYSTEMD % listener_id)
         except subprocess.CalledProcessError as e:
-            LOG.debug('Failed to %s keepalivedlvs listener %s',
-                      listener_id + ' : ' + action, e)
             return webob.Response(json={
                 'message': (f"Failed to {action} keepalivedlvs listener "
                             f"{listener_id}"),
@@ -280,11 +250,10 @@ def delete_lvs_listener(self, listener_id):
         if os.path.exists(keepalived_pid) and os.path.exists(
                 os.path.join('/proc',
                              util.get_keepalivedlvs_pid(listener_id))):
-            cmd = (f"/usr/sbin/service "
-                   f"octavia-keepalivedlvs-{listener_id} stop")
             try:
-                subprocess.check_output(cmd.split(), stderr=subprocess.STDOUT,
-                                        encoding='utf-8')
+                util.run_systemctl_command(
+                    consts.STOP,
+                    consts.KEEPALIVEDLVS_SYSTEMD % listener_id)
             except subprocess.CalledProcessError as e:
                 LOG.error("Failed to stop keepalivedlvs service: %s", e)
                 return webob.Response(json={
@@ -301,31 +270,21 @@ def delete_lvs_listener(self, listener_id):
                 os.remove(pid)
 
         # disable the service
-        init_system = util.get_os_init_system()
-        init_path = util.keepalived_lvs_init_path(init_system, listener_id)
+        init_path = util.keepalived_lvs_init_path(listener_id)
 
-        if init_system == consts.INIT_SYSTEMD:
+        try:
             util.run_systemctl_command(
-                consts.DISABLE, f"octavia-keepalivedlvs-{listener_id}")
-
-        elif init_system == consts.INIT_SYSVINIT:
-            init_disable_cmd = f"insserv -r {init_path}"
-            try:
-                subprocess.check_output(init_disable_cmd.split(),
-                                        stderr=subprocess.STDOUT,
-                                        encoding='utf-8')
-            except subprocess.CalledProcessError as e:
-                LOG.error("Failed to disable "
-                          "octavia-keepalivedlvs-%(list)s service: "
-                          "%(err)s", {'list': listener_id, 'err': str(e)})
-                return webob.Response(json={
-                    'message': (
-                        f"Error disabling octavia-keepalivedlvs-{listener_id} "
-                        f"service"),
-                    'details': e.output}, status=500)
-
-        elif init_system != consts.INIT_UPSTART:
-            raise util.UnknownInitError()
+                consts.DISABLE,
+                consts.KEEPALIVEDLVS_SYSTEMD % listener_id)
+        except subprocess.CalledProcessError as e:
+            LOG.error("Failed to disable "
+                      "octavia-keepalivedlvs-%(list)s service: "
+                      "%(err)s", {'list': listener_id, 'err': str(e)})
+            return webob.Response(json={
+                'message': (
+                    f"Error disabling octavia-keepalivedlvs-{listener_id} "
+                    "service"),
+                'details': e.output}, status=500)
 
         # delete init script ,config file and log file for that listener
         if os.path.exists(init_path):