diff --git a/dist/common/scripts/scylla_bootparam_setup b/dist/common/scripts/scylla_bootparam_setup deleted file mode 100755 index 971b92d33e..0000000000 --- a/dist/common/scripts/scylla_bootparam_setup +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# -# Copyright 2018-present ScyllaDB -# - -# -# SPDX-License-Identifier: AGPL-3.0-or-later - -import os -import sys -import argparse - -# keep this script just for compatibility. - -if __name__ == '__main__': - parser = argparse.ArgumentParser(description='Optimize boot parameter settings for Scylla.') - parser.add_argument('--ami', action='store_true', default=False, - help='setup AMI instance') - args = parser.parse_args() - sys.exit(0) diff --git a/dist/common/scripts/scylla_prepare b/dist/common/scripts/scylla_prepare index 48b2d72309..2b3c777e8f 100755 --- a/dist/common/scripts/scylla_prepare +++ b/dist/common/scripts/scylla_prepare @@ -139,13 +139,8 @@ if __name__ == '__main__': print('Requires root permission.') sys.exit(1) cfg = sysconfig_parser(sysconfdir_p() / 'scylla-server') - ami = cfg.get('AMI') mode = cfg.get('NETWORK_MODE') - if ami == 'yes' and os.path.exists('/etc/scylla/ami_disabled'): - os.remove('/etc/scylla/ami_disabled') - sys.exit(1) - if mode == 'virtio': tap = cfg.get('TAP') user = cfg.get('USER') diff --git a/dist/common/scripts/scylla_setup b/dist/common/scripts/scylla_setup index eef0fd3e49..e3a7507517 100755 --- a/dist/common/scripts/scylla_setup +++ b/dist/common/scripts/scylla_setup @@ -224,8 +224,6 @@ if __name__ == '__main__': help='specify swapfile directory (ex: /)') parser.add_argument('--swap-size', type=int, help='specify swapfile size in GB') - parser.add_argument('--ami', action='store_true', default=False, - help='setup AMI instance') parser.add_argument('--setup-nic-and-disks', action='store_true', default=False, help='optimize NIC and disks') parser.add_argument('--developer-mode', action='store_true', default=False, @@ -242,8 +240,6 @@ if __name__ == '__main__': if is_redhat_variant(): parser.add_argument('--no-selinux-setup', action='store_true', default=False, help='skip selinux setup') - parser.add_argument('--no-bootparam-setup', action='store_true', default=False, - help='skip bootparam setup') parser.add_argument('--no-ntp-setup', action='store_true', default=default_no_ntp_setup, help='skip ntp setup') diff --git a/dist/common/scripts/scylla_sysconfig_setup b/dist/common/scripts/scylla_sysconfig_setup index 65301ab2bd..6996a9d4b8 100755 --- a/dist/common/scripts/scylla_sysconfig_setup +++ b/dist/common/scripts/scylla_sysconfig_setup @@ -35,7 +35,6 @@ if __name__ == '__main__': disable_writeback_cache = str2bool(cfg.get('DISABLE_WRITEBACK_CACHE')) else: disable_writeback_cache = 'no' - ami = str2bool(cfg.get('AMI')) parser = argparse.ArgumentParser(description='Setting parameters on Scylla sysconfig file.') parser.add_argument('--nic', @@ -58,8 +57,6 @@ if __name__ == '__main__': help='Set enforcing fastest available Linux clocksource') parser.add_argument('--disable-writeback-cache', action='store_true', default=disable_writeback_cache, help='Disable disk writeback cache') - parser.add_argument('--ami', action='store_true', default=ami, - help='AMI instance mode') args = parser.parse_args() if args.nic and not is_valid_nic(args.nic): @@ -125,6 +122,4 @@ if __name__ == '__main__': if cfg.has_option('DISABLE_WRITEBACK_CACHE') and str2bool(cfg.get('DISABLE_WRITEBACK_CACHE')) != args.disable_writeback_cache: cfg.set('DISABLE_WRITEBACK_CACHE', bool2str(args.disable_writeback_cache)) - if str2bool(cfg.get('AMI')) != args.ami: - cfg.set('AMI', bool2str(args.ami)) cfg.commit() diff --git a/dist/common/sysconfig/scylla-server b/dist/common/sysconfig/scylla-server index a18fe29b34..77ee44edff 100644 --- a/dist/common/sysconfig/scylla-server +++ b/dist/common/sysconfig/scylla-server @@ -43,8 +43,5 @@ SCYLLA_ARGS="--log-to-syslog 1 --log-to-stdout 0 --default-log-level info --netw ## scylla arguments (for dpdk mode) #SCYLLA_ARGS="--log-to-syslog 1 --log-to-stdout 0 --default-log-level info --network-stack native --dpdk-pmd" -# setup as AMI instance -AMI=no - # Disable disk writeback cache DISABLE_WRITEBACK_CACHE=no