Remove sysvinit/upstart support

Recent modern operating systems commonly use systemd. Octavia no longer
supports very old version of Ubuntu/CentOS/Debian which use sysvinit or
upstart so supporting only systemd should be enough.

The remaining usage of the service command is replaced by the ones with
the systemctl command.

Change-Id: Ifc3f85bf280527c0f76b2c0e0db2be813249dafa
This commit is contained in:
Takashi Kajinami
2024-05-30 15:02:29 +09:00
parent 85c12eb7eb
commit 991e0da01e
25 changed files with 208 additions and 1100 deletions

View File

@@ -381,8 +381,14 @@ haproxy_amphora_opts = [
cfg.StrOpt('haproxy_cmd', default='/usr/sbin/haproxy',
help=_("The full path to haproxy")),
cfg.IntOpt('respawn_count', default=2,
deprecated_for_removal=True,
deprecated_reason='upstart support has been removed and this '
'option is no longer used.',
help=_("The respawn count for haproxy's upstart script")),
cfg.IntOpt('respawn_interval', default=2,
deprecated_for_removal=True,
deprecated_reason='upstart support has been removed and this '
'option is no longer used.',
help=_("The respawn interval for haproxy's upstart script")),
cfg.FloatOpt('rest_request_conn_timeout', default=10,
help=_("The time in seconds to wait for a REST API "

View File

@@ -694,9 +694,7 @@ MIN_QUOTA = QUOTA_UNLIMITED
MAX_QUOTA = 2000000000
HAPROXY_BASE_PEER_PORT = 1025
KEEPALIVED_JINJA2_UPSTART = 'keepalived.upstart.j2'
KEEPALIVED_JINJA2_SYSTEMD = 'keepalived.systemd.j2'
KEEPALIVED_JINJA2_SYSVINIT = 'keepalived.sysvinit.j2'
CHECK_SCRIPT_CONF = 'keepalived_check_script.conf.j2'
KEEPALIVED_CHECK_SCRIPT = 'keepalived_lvs_check_script.sh.j2'
@@ -722,26 +720,17 @@ AMP_ACTION_RELOAD = 'reload'
AMP_ACTION_RESTART = 'restart'
GLANCE_IMAGE_ACTIVE = 'active'
INIT_SYSTEMD = 'systemd'
INIT_UPSTART = 'upstart'
INIT_SYSVINIT = 'sysvinit'
INIT_UNKOWN = 'unknown'
VALID_INIT_SYSTEMS = (INIT_SYSTEMD, INIT_SYSVINIT, INIT_UPSTART)
INIT_PATH = '/sbin/init'
SYSTEMD_DIR = '/usr/lib/systemd/system'
SYSVINIT_DIR = '/etc/init.d'
UPSTART_DIR = '/etc/init'
INIT_PROC_COMM_PATH = '/proc/1/comm'
KEEPALIVED_SYSTEMD = 'octavia-keepalived.service'
KEEPALIVED_SYSVINIT = 'octavia-keepalived'
KEEPALIVED_UPSTART = 'octavia-keepalived.conf'
LOADBALANCER_SYSTEMD = 'haproxy-%s.service'
KEEPALIVED_SYSTEMD_PREFIX = 'octavia-keepalivedlvs-%s.service'
KEEPALIVED_SYSVINIT_PREFIX = 'octavia-keepalivedlvs-%s'
KEEPALIVED_UPSTART_PREFIX = 'octavia-keepalivedlvs-%s.conf'
KEEPALIVED_SYSTEMD = 'octavia-keepalived.service'
KEEPALIVEDLVS_SYSTEMD = 'octavia-keepalivedlvs-%s.service'
# Authentication
KEYSTONE = 'keystone'
@@ -821,6 +810,10 @@ AMPHORAV2 = 'amphorav2'
# systemctl commands
DISABLE = 'disable'
ENABLE = 'enable'
STOP = 'stop'
START = 'start'
RESTART = 'restart'
RELOAD = 'reload'
# systemd amphora netns service prefix
AMP_NETNS_SVC_PREFIX = 'amphora-netns'