Remove excessive YAQL check for multi-instance services.
It is mandatory for dcInstances in such services to be >= 2, so checking it is redundant. Change-Id: I2c1e5e156bba1c4c4ed1cd5fb643410c24055706 Fixes: bug MRN-853.
This commit is contained in:
parent
7ba9606982
commit
ed9b3916f8
|
@ -94,7 +94,7 @@ forms:
|
|||
helpText: Optional field for a machine hostname template
|
||||
validators:
|
||||
# if unitNamingPattern is given and dcInstances > 1, then '#' should occur in unitNamingPattern
|
||||
- expr: {YAQL: $.serviceConfiguration.dcInstances < 2 or not $.serviceConfiguration.unitNamingPattern.bool() or '#' in $.serviceConfiguration.unitNamingPattern}
|
||||
- expr: {YAQL: not $.serviceConfiguration.unitNamingPattern.bool() or '#' in $.serviceConfiguration.unitNamingPattern}
|
||||
message: Incrementation symbol "#" is required in the Hostname template
|
||||
- instanceConfiguration:
|
||||
fields:
|
||||
|
|
|
@ -154,7 +154,7 @@ forms:
|
|||
helpText: Optional field for a machine hostname template
|
||||
validators:
|
||||
# if unitNamingPattern is given and dcInstances > 1, then '#' should occur in unitNamingPattern
|
||||
- expr: {YAQL: $.clusterConfiguration.dcInstances < 2 or not $.clusterConfiguration.unitNamingPattern.bool() or '#' in $.clusterConfiguration.unitNamingPattern}
|
||||
- expr: {YAQL: not $.clusterConfiguration.unitNamingPattern.bool() or '#' in $.clusterConfiguration.unitNamingPattern}
|
||||
message: Incrementation symbol "#" is required in the Hostname template
|
||||
- unitsConfiguration:
|
||||
fields:
|
||||
|
|
|
@ -81,7 +81,7 @@ forms:
|
|||
helpText: Optional field for a machine hostname template
|
||||
validators:
|
||||
# if unitNamingPattern is given and dcInstances > 1, then '#' should occur in unitNamingPattern
|
||||
- expr: {YAQL: $.serviceConfiguration.dcInstances < 2 or not $.serviceConfiguration.unitNamingPattern.bool() or '#' in $.serviceConfiguration.unitNamingPattern}
|
||||
- expr: {YAQL: not $.serviceConfiguration.unitNamingPattern.bool() or '#' in $.serviceConfiguration.unitNamingPattern}
|
||||
message: Incrementation symbol "#" is required in the Hostname template
|
||||
- instanceConfiguration:
|
||||
fields:
|
||||
|
|
Loading…
Reference in New Issue