Skip to content

Commit 6b42677

Browse files
PalValaPalVala
authored
[patch] Remove prompts requesting RSL URL, RSL Org ID, and RSL token from aiservice-install (#2244)
1 parent 8f0d6bb commit 6b42677

29 files changed

Lines changed: 43 additions & 119 deletions

‎docs/guides/aiservice-install.md‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ The interactive install will guide you through the following steps:
8686
<li><strong>Certificate Issuer (Advanced Mode Only):</strong> Optionally configure a pre-configured certificate issuer for AI Service</li>
8787
<li><strong>Network configuration (Advanced Mode Only):</strong> Optionally enable IPv6 SingleStack network configuration for AI Service</li>
8888
<li><strong>Database Configuration:</strong> Set up database connection for AI Service</li>
89-
<li><strong>RSL Configuration:</strong> Configure Red Hat Service Locator integration</li>
89+
<li><strong>RSL Configuration:</strong> Optionally provide RSL CA certificate for Reliability Strategies Library integration</li>
9090
<li><strong>Tenant Configuration:</strong> Set up AI Service tenant(s)</li>
9191
<li><strong>Customize pod scheduling configuration for AI Workloads (Advanced Mode Only):</strong> Configure tolerations & nodeSelector for AI workloads (Training pipeline & Inference Service). See <a href="#scheduling-configuration-file-format">Scheduling Configuration File Format</a> for file configuration details.</li>
9292
<li><strong>Operational Mode:</strong> Choose between production or non-production mode</li>
@@ -156,10 +156,7 @@ docker run -e IBM_ENTITLEMENT_KEY -ti --rm -v ~:/mnt/home quay.io/ibmmas/cli:@@C
156156
--tenant-entitlement-end-date 2026-01-01 \
157157
--tenant-scheduling-config-file "/mnt/home/aiservice-tenant-affinity.yaml" \
158158
\
159-
--rsl-url http://your-rsl-host:3001/api/v3/vector/query \
160-
--rsl-org-id your_org_id \
161-
--rsl-token 'Bearer your_rsl_token' \
162-
\
159+
163160
--accept-license --no-confirm
164161
"
165162
```
@@ -263,13 +260,14 @@ docker run -e IBM_ENTITLEMENT_KEY -ti --rm -v ~:/mnt/home quay.io/ibmmas/cli:@@C
263260
| `--tenant-entitlement-start-date` | Entitlement start date (YYYY-MM-DD) | Yes | `2025-01-01` |
264261
| `--tenant-entitlement-end-date` | Entitlement end date (YYYY-MM-DD) | Yes | `2026-01-01` |
265262

266-
### RSL (Red Hat Service Locator) Configuration
263+
### RSL (Reliability Strategies Library) Configuration
267264

268265
| Parameter | Description | Required | Example |
269266
|-----------|-------------|----------|---------|
270-
| `--rsl-url` | RSL service URL | Optional | `http://host:3001/api/v3/vector/query` |
271-
| `--rsl-org-id` | RSL organization ID | Optional | `your_org_id` |
272-
| `--rsl-token` | RSL authentication token | Optional | `Bearer your_token` |
267+
| `--rsl-ca-crt` | RSL CA certificate (PEM format) | Optional | `/path/to/ca.crt` |
268+
269+
!!! note
270+
The `rsl_url`, `rsl_org_id`, and `rsl_token` parameters are no longer needed to pass inside the install command.
273271

274272
### AI Workload Scheduling Configuration
275273

‎python/src/mas/cli/aiservice/install/app.py‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -812,20 +812,11 @@ def aiServiceIntegrations(self) -> None:
812812
[
813813
"RSL (Reliable Strategy Library) connects to strategic asset management via STRATEGIZEAPI.",
814814
"",
815-
"RSL URL: https://api.rsl-service.suite.maximo.com (standard for all customers)",
816-
"Org ID: Get from MAS Manage > System Properties > 'mxe.rs.rslorgid'",
817-
"Token: Use your IBM entitlement key (same as MAS installation)",
818-
"",
819815
"Note: Future versions will auto-configure these from MAS Manage.",
820816
"",
821817
]
822818
)
823-
self.promptForString("RSL url", "rsl_url")
824-
self.promptForString("ORG Id of RSL", "rsl_org_id")
825-
rslToken = self.promptForString("Token for RSL", isPassword=True)
826-
if not rslToken.startswith("Bearer "):
827-
rslToken = "Bearer " + rslToken
828-
self.setParam("rsl_token", rslToken)
819+
829820
if self.yesOrNo("Does the RSL API use a self-signed certificate?"):
830821
self.promptForString("RSL CA certificate (PEM format)", "rsl_ca_crt")
831822

‎python/src/mas/cli/aiservice/install/argBuilder.py‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,6 @@ def buildCommand(self) -> str:
179179
if self.aiserviceTenantSchedulingConfigFileLocal:
180180
command += f' --tenant-scheduling-config-file "{self.aiserviceTenantSchedulingConfigFileLocal}"{newline}'
181181

182-
if self.getParam("rsl_url") != "":
183-
command += f" --rsl-url \"{self.getParam('rsl_url')}\"{newline}"
184-
if self.getParam("rsl_org_id") != "":
185-
command += f" --rsl-org-id \"{self.getParam('rsl_org_id')}\"{newline}"
186-
if self.getParam("rsl_token") != "":
187-
command += f" --rsl-token \"{self.getParam('rsl_token')}\"{newline}"
188182
if self.getParam("rsl_ca_crt") != "":
189183
command += f" --rsl-ca-crt \"{self.getParam('rsl_ca_crt')}\"{newline}"
190184

‎python/src/mas/cli/aiservice/install/argParser.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,7 @@ def isValidFile(parser, arg) -> str:
187187
)
188188
aiServiceArgGroup.add_argument("--tenant-entitlement-start-date", dest="tenant_entitlement_start_date", required=False, help="Start date for AI Service tenant")
189189
aiServiceArgGroup.add_argument("--tenant-entitlement-end-date", dest="tenant_entitlement_end_date", required=False, help="End date for AI Service tenant")
190-
aiServiceArgGroup.add_argument("--rsl-url", dest="rsl_url", required=False, help="rsl url")
191-
aiServiceArgGroup.add_argument("--rsl-org-id", dest="rsl_org_id", required=False, help="org id for rsl")
192-
aiServiceArgGroup.add_argument("--rsl-token", dest="rsl_token", required=False, help="token for rsl")
190+
193191
aiServiceArgGroup.add_argument(
194192
"--rsl-ca-crt", dest="rsl_ca_crt", required=False, help="CA certificate for RSL API (PEM format, optional, only if using self-signed certs)"
195193
)

‎python/src/mas/cli/aiservice/install/params.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,6 @@
9292
"tenant_entitlement_type",
9393
"tenant_entitlement_start_date",
9494
"tenant_entitlement_end_date",
95-
"rsl_url",
96-
"rsl_org_id",
97-
"rsl_token",
9895
"rsl_ca_crt",
9996
"environment_type",
10097
"configure_aiassistant",

‎python/src/mas/cli/aiservice/install/summarizer.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,6 @@ def aiServiceSummary(self) -> None:
8080
self.printParamSummary("URL", "aiservice_watsonxai_url")
8181
self.printParamSummary("Project ID", "aiservice_watsonxai_project_id")
8282

83-
self.printH2("RSL")
84-
self.printParamSummary("URL", "rsl_url")
85-
self.printParamSummary("Organization ID", "rsl_org_id")
86-
8783
def db2Summary(self) -> None:
8884
self.printH2("IBM Db2 Univeral Operator Configuration")
8985
self.printParamSummary("Action", "db2_action_aiservice")

‎python/src/mas/cli/install/app.py‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1870,20 +1870,11 @@ def aiServiceIntegrations(self) -> None:
18701870
[
18711871
"RSL (Reliable Strategy Library) connects to strategic asset management via STRATEGIZEAPI.",
18721872
"",
1873-
"RSL URL: https://api.rsl-service.suite.maximo.com (standard for all customers)",
1874-
"Org ID: Get from MAS Manage > System Properties > 'mxe.rs.rslorgid'",
1875-
"Token: Use your IBM entitlement key (same as MAS installation)",
1876-
"",
18771873
"Note: Future versions will auto-configure these from MAS Manage.",
18781874
"",
18791875
]
18801876
)
1881-
self.promptForString("RSL url", "rsl_url")
1882-
self.promptForString("ORG Id of RSL", "rsl_org_id")
1883-
rslToken = self.promptForString("Token for RSL", isPassword=True)
1884-
if not rslToken.startswith("Bearer "):
1885-
rslToken = "Bearer " + rslToken
1886-
self.setParam("rsl_token", rslToken)
1877+
18871878
if self.yesOrNo("Does the RSL API use a self-signed certificate?"):
18881879
self.promptForString("RSL CA certificate (PEM format)", "rsl_ca_crt")
18891880

‎python/src/mas/cli/install/argBuilder.py‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -427,12 +427,6 @@ def buildCommand(self) -> str:
427427
if self.aiserviceTenantSchedulingConfigFileLocal:
428428
command += f' --tenant-scheduling-config-file "{self.aiserviceTenantSchedulingConfigFileLocal}"{newline}'
429429

430-
if self.getParam("rsl_url") != "":
431-
command += f" --rsl-url \"{self.getParam('rsl_url')}\"{newline}"
432-
if self.getParam("rsl_org_id") != "":
433-
command += f" --rsl-org-id \"{self.getParam('rsl_org_id')}\"{newline}"
434-
if self.getParam("rsl_token") != "":
435-
command += f" --rsl-token \"{self.getParam('rsl_token')}\"{newline}"
436430
if self.getParam("rsl_ca_crt") != "":
437431
command += f" --rsl-ca-crt \"{self.getParam('rsl_ca_crt')}\"{newline}"
438432

‎python/src/mas/cli/install/argParser.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,9 +1040,7 @@ def isValidFile(parser: argparse.ArgumentParser, arg: str) -> str:
10401040
required=False,
10411041
help="End date for AI Service tenant",
10421042
)
1043-
aiServiceTenantArgGroup.add_argument("--rsl-url", dest="rsl_url", required=False, help="rsl url")
1044-
aiServiceTenantArgGroup.add_argument("--rsl-org-id", dest="rsl_org_id", required=False, help="org id for rsl")
1045-
aiServiceTenantArgGroup.add_argument("--rsl-token", dest="rsl_token", required=False, help="token for rsl")
1043+
10461044
aiServiceTenantArgGroup.add_argument(
10471045
"--rsl-ca-crt",
10481046
dest="rsl_ca_crt",

‎python/src/mas/cli/install/params.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,6 @@
210210
"tenant_entitlement_type",
211211
"tenant_entitlement_start_date",
212212
"tenant_entitlement_end_date",
213-
"rsl_url",
214-
"rsl_org_id",
215-
"rsl_token",
216213
"rsl_ca_crt",
217214
"environment_type",
218215
"configure_aiassistant",

0 commit comments

Comments
 (0)