Skip to content

Commit daf7c5a

Browse files
David-M-IBMDavid-M-IBM
authored
Merge pull request #32 from cloud-native-toolkit/dam-hotfix
add fix for quotes
2 parents cb11203 + c50e69a commit daf7c5a

6 files changed

Lines changed: 226 additions & 90 deletions

‎cp4d/5.0.x-tse-l4-base/cp4d-cloud-pak-deployer-pipeline-run-ocpv.yaml‎

Lines changed: 82 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,90 @@ spec:
2121
- name: ibm-entitlement-key
2222
value: "false"
2323
- name: ocp-client-version
24-
value: "4.16"
24+
value: "4.15"
2525
- name: cp4d-version
26-
value: "5.0.3"
26+
value: "5.0.1"
2727
- name: cpd-use-fs-iam
2828
value: "False"
2929
- name: cpd-sequential-install
3030
value: "True"
31-
- name: db2-state
32-
value: "installed"
33-
- name: wml-state
34-
value: "installed"
35-
- name: ws-state
36-
value: "installed"
37-
- name: watsonx-governance-state
38-
value: "installed"
39-
- name: watsonx-gov-installType
40-
value: "all"
41-
- name: watsonx-gov-enableFactsheet
42-
value: "true"
43-
- name: watsonx-gov-enableOpenpages
44-
value: "true"
45-
- name: watsonx-gov-enableOpenscale
46-
value: "true"
31+
- name: cloud-pak-deployer-version
32+
value: "latest"
33+
- name: install-openshift-ai
34+
value: "'True'"
35+
- name: configure-gpu
36+
value: "'True'"
37+
# - name: analyticsengine-state
38+
# value: "installed"
39+
# - name: spss-state
40+
# value: "installed"
41+
# - name: ca-state
42+
# value: "installed"
43+
# - name: dashboard-state
44+
# value: "installed"
45+
# - name: dataproduct-state
46+
# value: "installed"
47+
# - name: datastage-ent-plus-state
48+
# value: "installed"
49+
# - name: db2-state
50+
# value: "installed"
51+
# - name: dmc-state
52+
# value: "installed"
53+
# - name: dp-state
54+
# value: "installed"
55+
# - name: dv-state
56+
# value: "installed"
57+
# - name: mantaflow-state
58+
# value: "installed"
59+
# - name: wkc-state
60+
# value: "installed"
61+
# - name: wkc-options-knowledge-graph
62+
# value: "True"
63+
# - name: wkc-options-enable-data-quality
64+
# value: "True"
65+
# - name: ikc-premium-state
66+
# value: "installed"
67+
# - name: ikc-premium-options-knowledge-graph
68+
# value: "True"
69+
# - name: ikc-premium-options-enable-data-quality
70+
# value: "True"
71+
# - name: ikc-standard-state
72+
# value: "installed"
73+
# - name: ikc-standard-options-knowledge-graph
74+
# value: "True"
75+
# - name: ikc-standard-options-enable-data-quality
76+
# value: "True"
77+
# - name: watsonx-orchestrate-state
78+
# value: "installed"
79+
# - name: watsonx-assistant-state
80+
# value: "installed"
81+
# - name: watsonx-governance-state
82+
# value: "installed"
83+
# - name: watsonx-gov-installType
84+
# value: "all"
85+
# - name: watsonx-gov-enableFactsheet
86+
# value: "true"
87+
# - name: watsonx-gov-enableOpenpages
88+
# value: "true"
89+
# - name: watsonx-gov-enableOpenscale
90+
# value: "true"
91+
# - name: watsonx-data-state
92+
# value: "installed"
93+
# - name: watsonx-ai-state
94+
# value: "installed"
95+
# - name: watsonx-ai-tuning-disabled #Set this to true if you wat to not install the tuning studio
96+
# value: "true"
97+
# - name: configure-gpu #Set this to False if you already installed/configured NVIDIA and NFD operators
98+
# value: "True"
99+
# - name: install-openshift-ai #Set this to False if you already installed and configured OpenShift AI operator
100+
# value: "True"
101+
# - name: ws-state
102+
# value: "installed"
103+
# - name: ws-runtimes-state
104+
# value: "installed"
105+
# - name: wml-state
106+
# value: "installed"
107+
# - name: match360-state
108+
# value: "installed"
109+
# - name: watson-discovery-state
110+
# value: "installed"

‎cp4d/5.0.x-tse-l4-base/cp4d-cloud-pak-deployer-pipeline-run.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ spec:
2222
value: "False"
2323
- name: cpd-sequential-install
2424
value: "True"
25+
- name: cloud-pak-deployer-version
26+
value: "v2.9.4"
27+
- name: install-openshift-ai
28+
value: "'True'"
29+
- name: configure-gpu
30+
value: "'True'"
2531
# - name: analyticsengine-state
2632
# value: "installed"
2733
# - name: spss-state

‎cp4d/5.0.x-tse-l4-base/cp4d-cloud-pak-deployer-pipeline.yaml‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ spec:
2828
Choose the defined storage class for the cloud pak deployer.
2929
{
3030
"options": [
31-
{"text": "auto-storage","value": "auto-storage", "default": "true"},
32-
{"text": "ocs-storage","value": "ocs-storage"},
33-
{"text": "custom","value": "custom"},
34-
{"text": "nfs-storage","value": "nfs-storage"}
31+
"auto-storage",
32+
"ocs-storage",
33+
"custom",
34+
"nfs-storage"
3535
]
3636
}
3737
default: "auto-storage"
@@ -41,9 +41,9 @@ spec:
4141
Choose the defined storage type for the cloud pak deployer.
4242
{
4343
"options": [
44-
{"text": "auto","value": "auto", "default": "true"},
45-
{"text": "ocs","value": "ocs"},
46-
{"text": "nfs","value": "nfs"}
44+
"auto",
45+
"ocs",
46+
"nfs"
4747
]
4848
}
4949
default: "auto"
@@ -68,45 +68,45 @@ spec:
6868
- name: cpd-sequential-install
6969
type: string
7070
description: |
71-
Do you want to install components sequentially?
71+
Do you want to install components sequentially? Choose "True" if yes.
7272
{
7373
"options": [
74-
{"text": "No","value": "False"},
75-
{"text": "Yes","value": "True", "default": "true"}
74+
"False",
75+
"True"
7676
]
7777
}
7878
default: "True"
7979
- name: cpd-use-fs-iam
8080
type: string
8181
description: |
82-
Do you want to enable FS IAM?
82+
Do you want to enable FS IAM? Choose "True" if yes.
8383
{
8484
"options": [
85-
{"text": "Yes","value": "True", "default": "true"},
86-
{"text": "No","value": "False"}
85+
"True",
86+
"False"
8787
]
8888
}
8989
default: "True"
9090

9191
- name: scheduler-state
9292
type: string
9393
description: |
94-
Do you want to install scheduler?
94+
Do you want to install scheduler? Choose "installed" if yes.
9595
{
9696
"options": [
97-
{"text": "No","value": "removed", "default": "true"},
98-
{"text": "Yes","value": "installed"}
97+
"removed",
98+
"installed"
9999
]
100100
}
101101
default: "removed"
102102
- name: analyticsengine-state
103103
type: string
104104
description: |
105-
Do you want to install analytics engine?
105+
Do you want to install analytics engine? Choose "installed" if yes.
106106
{
107107
"options": [
108-
{"text": "No","value": "removed", "default": "true"},
109-
{"text": "Yes","value": "installed"}
108+
"removed",
109+
"installed"
110110
]
111111
}
112112
default: "removed"
@@ -116,31 +116,31 @@ spec:
116116
Choose the size of analytics engine installation. (only applied if component is installed)
117117
{
118118
"options": [
119-
{"text": "Small","value": "small", "default": "true"},
120-
{"text": "Medium","value": "medium"},
121-
{"text": "Large","value": "large"}
119+
"small",
120+
"medium",
121+
"large"
122122
]
123123
}
124124
default: "small"
125125
- name: bigsql-state
126126
type: string
127127
description: |
128-
Do you want to install bigsql?
128+
Do you want to install bigsql? Choose "installed" if yes.
129129
{
130130
"options": [
131-
{"text": "No","value": "removed", "default": "true"},
132-
{"text": "Yes","value": "installed"}
131+
"removed",
132+
"installed"
133133
]
134134
}
135135
default: "removed"
136136
- name: ca-state
137137
type: string
138138
description: |
139-
Do you want to install cognos analytics?
139+
Do you want to install cognos analytics? Choose "installed" if yes.
140140
{
141141
"options": [
142-
{"text": "No","value": "removed", "default": "true"},
143-
{"text": "Yes","value": "installed"}
142+
"removed",
143+
"installed"
144144
]
145145
}
146146
default: "removed"
@@ -150,9 +150,9 @@ spec:
150150
Choose size of cognos analytics installation. (only applied if component is installed)
151151
{
152152
"options": [
153-
{"text": "Small","value": "small", "default": "true"},
154-
{"text": "Medium","value": "medium"},
155-
{"text": "Large","value": "large"}
153+
"small",
154+
"medium",
155+
"large"
156156
]
157157
}
158158
default: "small"
@@ -163,33 +163,33 @@ spec:
163163
- name: dashboard-state
164164
type: string
165165
description: |
166-
Do you want to install cognos dashboards?
166+
Do you want to install cognos dashboards? Choose "installed" if yes.
167167
{
168168
"options": [
169-
{"text": "No","value": "removed", "default": "true"},
170-
{"text": "Yes","value": "installed"}
169+
"removed",
170+
"installed"
171171
]
172172
}
173173
default: "removed"
174174
- name: datagate-state
175175
type: string
176176
description: |
177-
Do you want to install datagate?
177+
Do you want to install datagate? Choose "installed" if yes.
178178
{
179179
"options": [
180-
{"text": "No","value": "removed", "default": "true"},
181-
{"text": "Yes","value": "installed"}
180+
"removed",
181+
"installed"
182182
]
183183
}
184184
default: "removed"
185185
- name: dataproduct-state
186186
type: string
187187
description: |
188-
Do you want to install Data Product Hub?
188+
Do you want to install Data Product Hub? Choose "installed" if yes.
189189
{
190190
"options": [
191-
{"text": "No","value": "removed", "default": "true"},
192-
{"text": "Yes","value": "installed"}
191+
"removed",
192+
"installed"
193193
]
194194
}
195195
default: "removed"
@@ -620,25 +620,25 @@ spec:
620620
- name: install-openshift-ai
621621
type: string
622622
description: |
623-
Install the OpenShift AI operator and configure it for CP4D.
623+
Do you want to install the OpenShift AI operator and configure it for CP4D? If yes, use value 'True'
624624
{
625625
"options": [
626-
{"text": "No","value": "False"},
627-
{"text": "Yes","value": "True", "default": "true"}
626+
"'False'",
627+
"'True'"
628628
]
629629
}
630-
default: "True"
630+
default: "'True'"
631631
- name: configure-gpu
632632
type: string
633633
description: |
634-
Install the NVIDIA operator and Node Feature Discovery for GPU nodes.
634+
Do you want to install the NVIDIA operator and Node Feature Discovery for GPU nodes? If yes, use value 'True'
635635
{
636636
"options": [
637-
{"text": "No","value": "False"},
638-
{"text": "Yes","value": "True", "default": "true"}
637+
"'False'",
638+
"'True'"
639639
]
640640
}
641-
default: "True"
641+
default: "'True'"
642642
- name: watsonx-ai-state
643643
type: string
644644
description: |

0 commit comments

Comments
 (0)