Skip to content

Commit

Permalink
scylla_conifgure.py: remove "experimental" option
Browse files Browse the repository at this point in the history
Following the changes done in
scylladb/scylladb#15233 . we need also remove
the `Experimental` options in machine-image

Closes: #484
  • Loading branch information
yaronkaikov committed Oct 1, 2023
1 parent 17f40ab commit daf190d
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 4 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion common/scylla_configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions tests/test_scylla_configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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):
Expand Down

0 comments on commit daf190d

Please sign in to comment.