Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ CHANGELOG
- Use inclusive language in user facing messages and internal naming convention.
- Change the default of instance types from the hardcoded `t2.micro` to the free tier instance type
(`t2.micro` or `t3.micro` dependent on region). In regions without free tier, the default is `t3.micro`.
- Enable support for p4d as head node instance type. (p4d was already supported as compute node in 2.10.0)
- Upgrade EFA installer to version 1.11.0
- EFA configuration: ``efa-config-1.6`` (from efa-config-1.5)
- EFA profile: ``efa-profile-1.2`` (from efa-profile-1.1)
Expand Down
2 changes: 1 addition & 1 deletion cli/src/pcluster/config/validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"sc1": (500, 16 * 1024),
}

HEAD_NODE_UNSUPPORTED_INSTANCE_TYPES = ["p4d.24xlarge"]
HEAD_NODE_UNSUPPORTED_INSTANCE_TYPES = []
HEAD_NODE_UNSUPPORTED_MESSAGE = "The instance type '{0}' is not supported as head node."

# Constants for section labels
Expand Down
4 changes: 1 addition & 3 deletions cli/tests/pcluster/config/test_validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,7 @@ def test_ec2_instance_type_validator(mocker, instance_type, expected_message):
utils.assert_param_validator(mocker, config_parser_dict, expected_message)


@pytest.mark.parametrize(
"instance_type, expected_message", [("t2.micro", None), ("c4.xlarge", None), ("p4d.24xlarge", "is not supported")]
)
@pytest.mark.parametrize("instance_type, expected_message", [("t2.micro", None), ("c4.xlarge", None)])
def test_head_node_instance_type_validator(mocker, instance_type, expected_message):
config_parser_dict = {"cluster default": {"master_instance_type": instance_type}}
utils.assert_param_validator(mocker, config_parser_dict, expected_message)
Expand Down
9 changes: 0 additions & 9 deletions cli/tests/pcluster/configure/test_pcluster_configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -914,12 +914,3 @@ def test_hit_config_file(mocker, capsys, test_datadir):
# Expected sys exit with error
with pytest.raises(SystemExit, match="ERROR: Configuration in file .* cannot be overwritten"):
_run_configuration(mocker, old_config_file, with_config=True)


def test_invalid_p4d_head_node_type(mocker):
with pytest.raises(StopIteration):
assert_that(general_wrapper_for_prompt_testing(mocker, head_node_instance="p4d.24xlarge")).is_true()


def test_valid_p4d_compute_node_type(mocker):
assert_that(general_wrapper_for_prompt_testing(mocker, compute_instance="p4d.24xlarge")).is_true()
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cluster_template = default
base_os = {{ os }}
key_name = {{ key_name }}
scheduler = {{ scheduler }}
master_instance_type = c5.xlarge
master_instance_type = {{ instance }}
compute_instance_type = {{ instance }}
initial_queue_size = 1
maintain_initial_size = true
Expand Down