Skip to content

Commit

Permalink
Merge pull request #47 from spolti/RHPAM-1016-1
Browse files Browse the repository at this point in the history
fix formating
  • Loading branch information
errantepiphany committed May 29, 2018
2 parents 2eca386 + bfd9a8c commit 1206ce1
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions tools/gen_template_docs.py
Expand Up @@ -23,10 +23,8 @@
GIT_REPO_LIST = [RHDM_GIT_REPO, RHPAM_GIT_REPO]
REPO_NAME = "application-templates/"
TEMPLATE_DOCS = "docs/"
#APPLICATION_DIRECTORIES = ("rhpam-7-openshift-image", "rhdm-7-openshift-image", "docs")
#template_dirs = [ 'rhpam-7-openshift-image/templates', 'rhdm-7-openshift-image/templates']
APPLICATION_DIRECTORIES = ("rhpam-7-openshift-image", "docs")
template_dirs = [ 'rhpam-7-openshift-image/templates']
APPLICATION_DIRECTORIES = ("rhpam-7-openshift-image", "rhdm-7-openshift-image", "docs")
template_dirs = [ 'rhpam-7-openshift-image/templates', 'rhdm-7-openshift-image/templates']

# used to link the image to the image.yaml when the given image is used by a s2i build
LINKS = {"rhdm70-kieserver-openshift:1.0": "../../../kieserver/image.yaml[`rhdm-7/rhdm70-kieserver-openshift`]",
Expand Down Expand Up @@ -177,7 +175,7 @@ def getVolumePurpose(name):
def getVariableInfo(data, name, value):
for d in data:
if(d["name"] == name or name[1:] in d["name"] or d["name"][1:] in name):
return d[value]
return str(d[value]).replace("|", "\\|")
if(value == "value" and name in PARAMETER_VALUES.keys()):
return PARAMETER_VALUES[name]
else:
Expand All @@ -191,7 +189,7 @@ def createParameterTable(data):
envVar = getVariableInfo(environment, param["name"], "name")
value = param["value"] if param.get("value") else getVariableInfo(environment, param["name"], "value")
req = param["required"] if "required" in param else "?"
columns = [param["name"], envVar, str(param["description"]).replace("|", "\\|"), value, req]
columns = [param["name"], envVar, str(param["description"]).replace("|", "\\|"), value, req]
text += buildRow(columns)
return text

Expand Down

0 comments on commit 1206ce1

Please sign in to comment.