openstack
/
murano-dashboard
Code Issues Proposed changes

Fix MRN-931. Hostname validation fixed 

Change-Id: I96cb8ee13e2905fab9ba41b6dea1ae84b74c7765
This commit is contained in:
Ekaterina Fedorova 2013-09-02 20:07:47 +04:00
parent c02e3afa03
commit 8f9e39d289
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
muranodashboard/services/ActiveDirectory.yaml
View File

@ -91,7 +91,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: $.serviceConfiguration.dcInstances < 2 or not $.serviceConfiguration.unitNamingPattern.bool() or ('#' in $.serviceConfiguration.unitNamingPattern)}
message: Incrementation symbol "#" is required in the Hostname template
- instanceConfiguration:
fields:

2
muranodashboard/services/AspNetAppFarm.yaml
View File

@ -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: 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:

2
muranodashboard/services/WebServerFarm.yaml
View File

@ -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: 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: