From daf190d82618fe76cd90ffcebd1f3feb5a62cd93 Mon Sep 17 00:00:00 2001 From: Yaron Kaikov Date: Sun, 1 Oct 2023 07:15:11 +0300 Subject: [PATCH] scylla_conifgure.py: remove "experimental" option Following the changes done in https://github.com/scylladb/scylladb/pull/15233 . we need also remove the `Experimental` options in machine-image Closes: https://github.com/scylladb/scylla-machine-image/issues/484 --- README.md | 1 - common/scylla_configure.py | 1 - tests/test_scylla_configure.py | 2 -- 3 files changed, 4 deletions(-) diff --git a/README.md b/README.md index 4d688b97..2fabc31d 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,6 @@ listed here only the one get defaults scylla AMI * **Object Properties** * **cluster_name** ([*string*](https://docs.python.org/library/stdtypes.html#str)) – Name of the cluster (*default=`generated name that would work for only one node cluster`*) - * **experimental** ([*boolean*](https://docs.python.org/library/stdtypes.html#boolean-values)) – To enable all experimental features add to the scylla.yaml (*default=’false’*) * **auto_bootstrap** ([*boolean*](https://docs.python.org/library/stdtypes.html#boolean-values)) – Enable auto bootstrap (*default=’true’*) * **listen_address** ([*string*](https://docs.python.org/library/stdtypes.html#str)) – Defaults to ec2 instance private ip * **broadcast_rpc_address** ([*string*](https://docs.python.org/library/stdtypes.html#str)) – Defaults to ec2 instance private ip diff --git a/common/scylla_configure.py b/common/scylla_configure.py index 7c3466c1..9031a491 100755 --- a/common/scylla_configure.py +++ b/common/scylla_configure.py @@ -24,7 +24,6 @@ class ScyllaMachineImageConfigurator(UserData): CONF_DEFAULTS = { 'scylla_yaml': { 'cluster_name': "scylladb-cluster-%s" % int(time.time()), - 'experimental': False, 'auto_bootstrap': True, 'listen_address': "", # will be configured as a private IP when instance meta data is read 'broadcast_rpc_address': "", # will be configured as a private IP when instance meta data is read diff --git a/tests/test_scylla_configure.py b/tests/test_scylla_configure.py index 07b93973..ee1ee857 100644 --- a/tests/test_scylla_configure.py +++ b/tests/test_scylla_configure.py @@ -128,7 +128,6 @@ def test_user_data_params_are_set(self): assert scylla_yaml["broadcast_rpc_address"] == ip_to_set assert scylla_yaml["seed_provider"][0]["parameters"][0]["seeds"] == ip_to_set # check defaults - assert scylla_yaml["experimental"] is False assert scylla_yaml["auto_bootstrap"] is True def test_postconfig_script(self): @@ -202,7 +201,6 @@ def test_multipart_user_data_params_are_set(self): assert scylla_yaml["broadcast_rpc_address"] == ip_to_set assert scylla_yaml["seed_provider"][0]["parameters"][0]["seeds"] == ip_to_set # check defaults - assert scylla_yaml["experimental"] is False assert scylla_yaml["auto_bootstrap"] is True def test_do_not_start_on_first_boot(self):