Skip to content

Commit 93328b0

Browse files
authored
Merge branch 'release-2.11' into update_tabulate_requirement
2 parents dc97bce + 40c23df commit 93328b0

File tree

5 files changed

+32
-4
lines changed

5 files changed

+32
-4
lines changed

cli/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def readme():
2020
return f.read()
2121

2222

23-
VERSION = "2.11.7"
23+
VERSION = "2.11.8"
2424
REQUIRES = [
2525
"setuptools",
2626
"boto3>=1.16.14",

cli/src/pcluster/config/cfn_param_types.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,15 @@ def get_cfn_value(self):
8888
"""
8989
return str(self.value if self.value is not None else self.definition.get("default", "NONE"))
9090

91+
def refresh(self):
92+
"""
93+
Refresh the parameter's value.
94+
95+
Does nothing by default. Subclasses can implement this method by updating parameter's value based on
96+
PClusterConfig status.
97+
"""
98+
pass
99+
91100

92101
class CommaSeparatedCfnParam(CfnParam):
93102
"""Class to manage comma separated parameters. E.g. additional_iam_policies."""

cli/src/pcluster/config/json_param_types.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,15 @@ def _parse_value(self, config_parser, section_name):
5656
# No conversion is applied at base level
5757
return config_parser.get(section_name, self.key)
5858

59+
def refresh(self):
60+
"""
61+
Refresh the parameter's value.
62+
63+
Does nothing by default. Subclasses can implement this method by updating parameter's value based on
64+
PClusterConfig status.
65+
"""
66+
pass
67+
5968

6069
class IntJsonParam(JsonParam):
6170
"""Base JsonParam to manage int parameters."""
@@ -86,6 +95,15 @@ def get_string_value(self):
8695
"""Convert internal representation into string."""
8796
return self.get_default_value().lower() if self.value is None else str(bool(self.value)).lower()
8897

98+
def refresh(self):
99+
"""
100+
Refresh the parameter's value.
101+
102+
Does nothing by default. Subclasses can implement this method by updating parameter's value based on
103+
PClusterConfig status.
104+
"""
105+
pass
106+
89107

90108
class FloatJsonParam(JsonParam):
91109
"""Base JsonParam to manage float parameters."""

cli/src/pcluster/config/param_types.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ def reset_value(self):
222222
"""Reset parameter to default value."""
223223
self.value = self.get_default_value()
224224

225+
@abc.abstractmethod
225226
def refresh(self):
226227
"""
227228
Refresh the parameter's value.

cloudformation/aws-parallelcluster.cfn.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"AWSTemplateFormatVersion": "2010-09-09",
3-
"Description": "AWS ParallelCluster Template. Version: aws-parallelcluster-2.11.7",
3+
"Description": "AWS ParallelCluster Template. Version: aws-parallelcluster-2.11.8",
44
"Parameters": {
55
"KeyName": {
66
"Description": "Name of an existing EC2 KeyPair to enable SSH access to the instances using the default cluster user.",
@@ -1100,8 +1100,8 @@
11001100
},
11011101
"PackagesVersions": {
11021102
"default": {
1103-
"parallelcluster": "2.11.7",
1104-
"cookbook": "aws-parallelcluster-cookbook-2.11.7",
1103+
"parallelcluster": "2.11.8",
1104+
"cookbook": "aws-parallelcluster-cookbook-2.11.8",
11051105
"chef": "17.2.29",
11061106
"berkshelf": "7.0.10",
11071107
"ami": "dev"

0 commit comments

Comments
 (0)