openstack/murano-dashboard
Code Issues Proposed changes

Moved YAQL to PyPI

Browse Source 
Change-Id: I7ae888d2708ca438f7e5c94a53e7ddbcc134f4f6
This commit is contained in:
Serg Melikyan 2013-08-26 13:56:51 +04:00
parent b5e07f147f
commit 9f8ecd9a0d
6 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
muranodashboard/services/ActiveDirectory.yaml
View File

@ -92,7 +92,7 @@ forms:
helpText: Optional field for a machine hostname template helpText: Optional field for a machine hostname template
validators: validators:
# if unitNamingPattern is given and dcInstances > 1, then '#' should occur in unitNamingPattern # if unitNamingPattern is given and dcInstances > 1, then '#' should occur in unitNamingPattern
- expr: {YAQL: $.serviceConfiguration.dcInstances < 2 or not $.serviceConfiguration.unitNamingPattern 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 message: Incrementation symbol "#" is required in the Hostname template
- instanceConfiguration: - instanceConfiguration:
fields: fields:

2
muranodashboard/services/AspNetAppFarm.yaml
View File

@ -89,7 +89,7 @@ forms:
helpText: Optional field for a machine hostname template helpText: Optional field for a machine hostname template
validators: validators:
# if unitNamingPattern is given and dcInstances > 1, then '#' should occur in unitNamingPattern # if unitNamingPattern is given and dcInstances > 1, then '#' should occur in unitNamingPattern
- expr: {YAQL: $.serviceConfiguration.dcInstances < 2 or not $.serviceConfiguration.unitNamingPattern 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 message: Incrementation symbol "#" is required in the Hostname template
- instanceConfiguration: - instanceConfiguration:
fields: fields:

2
muranodashboard/services/MsSqlClusterServer.yaml
View File

@ -154,7 +154,7 @@ forms:
helpText: Optional field for a machine hostname template helpText: Optional field for a machine hostname template
validators: validators:
# if unitNamingPattern is given and dcInstances > 1, then '#' should occur in unitNamingPattern # if unitNamingPattern is given and dcInstances > 1, then '#' should occur in unitNamingPattern
- expr: {YAQL: $.serviceConfiguration.dcInstances < 2 or not $.serviceConfiguration.unitNamingPattern 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 message: Incrementation symbol "#" is required in the Hostname template
- unitsConfiguration: - unitsConfiguration:
fields: fields:

2
muranodashboard/services/WebServerFarm.yaml
View File

@ -81,7 +81,7 @@ forms:
helpText: Optional field for a machine hostname template helpText: Optional field for a machine hostname template
validators: validators:
# if unitNamingPattern is given and dcInstances > 1, then '#' should occur in unitNamingPattern # if unitNamingPattern is given and dcInstances > 1, then '#' should occur in unitNamingPattern
- expr: {YAQL: $.serviceConfiguration.dcInstances < 2 or not $.serviceConfiguration.unitNamingPattern 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 message: Incrementation symbol "#" is required in the Hostname template
- instanceConfiguration: - instanceConfiguration:
fields: fields:

1
requirements.txt
View File

@ -8,4 +8,5 @@ PyYAML
django-pipeline django-pipeline
django-floppyforms==1.1 django-floppyforms==1.1
ordereddict ordereddict
yaql==0.2
http://tarballs.openstack.org/python-muranoclient/python-muranoclient-release-0.2.tar.gz#egg=muranoclient-dev http://tarballs.openstack.org/python-muranoclient/python-muranoclient-release-0.2.tar.gz#egg=muranoclient-dev

2
setup.sh
View File

@ -188,7 +188,7 @@ CLONE_FROM_GIT=$1
exit 1 exit 1
fi fi
# NON PIP PACKAGES INSTALL START # NON PIP PACKAGES INSTALL START
for pkg in tsufiev.djblets ativelkov.yaql; do for pkg in tsufiev.djblets; do
PACKAGE=${pkg##*.} PACKAGE=${pkg##*.}
OWNER=${pkg%.*} OWNER=${pkg%.*}
SUFFIX=master.zip SUFFIX=master.zip