mas-cli 11.4.0__py3-none-any.whl → 11.5.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of mas-cli might be problematic. Click here for more details.
- mas/cli/__init__.py +1 -1
- mas/cli/cli.py +5 -7
- mas/cli/displayMixins.py +18 -14
- mas/cli/gencfg.py +3 -2
- mas/cli/install/__init__.py +1 -1
- mas/cli/install/app.py +30 -30
- mas/cli/install/argBuilder.py +159 -158
- mas/cli/install/argParser.py +3 -1
- mas/cli/install/settings/__init__.py +5 -4
- mas/cli/install/settings/additionalConfigs.py +25 -24
- mas/cli/install/settings/db2Settings.py +2 -2
- mas/cli/install/settings/kafkaSettings.py +1 -0
- mas/cli/install/settings/manageSettings.py +38 -19
- mas/cli/install/settings/turbonomicSettings.py +1 -0
- mas/cli/install/summarizer.py +6 -6
- mas/cli/templates/ibm-mas-tekton.yaml +587 -150
- mas/cli/uninstall/__init__.py +1 -1
- mas/cli/uninstall/app.py +15 -14
- mas/cli/uninstall/argParser.py +1 -1
- mas/cli/update/__init__.py +1 -1
- mas/cli/update/app.py +39 -39
- mas/cli/update/argParser.py +1 -1
- mas/cli/upgrade/__init__.py +1 -1
- mas/cli/upgrade/app.py +8 -7
- mas/cli/upgrade/argParser.py +1 -1
- {mas_cli-11.4.0.data → mas_cli-11.5.0.data}/scripts/mas-cli +8 -6
- {mas_cli-11.4.0.dist-info → mas_cli-11.5.0.dist-info}/METADATA +1 -1
- {mas_cli-11.4.0.dist-info → mas_cli-11.5.0.dist-info}/RECORD +30 -30
- {mas_cli-11.4.0.dist-info → mas_cli-11.5.0.dist-info}/WHEEL +1 -1
- {mas_cli-11.4.0.dist-info → mas_cli-11.5.0.dist-info}/top_level.txt +0 -0
mas/cli/install/argBuilder.py
CHANGED
|
@@ -12,6 +12,7 @@ import logging
|
|
|
12
12
|
|
|
13
13
|
logger = logging.getLogger(__name__)
|
|
14
14
|
|
|
15
|
+
|
|
15
16
|
class installArgBuilderMixin():
|
|
16
17
|
def buildCommand(self) -> str:
|
|
17
18
|
# MAS Catalog Selection & Entitlement
|
|
@@ -94,7 +95,7 @@ class installArgBuilderMixin():
|
|
|
94
95
|
if self.getParam('mas_trust_default_cas') == "false":
|
|
95
96
|
command += f" --disable-ca-trust{newline}"
|
|
96
97
|
|
|
97
|
-
if self.getParam('mas_manual_cert_mgmt')
|
|
98
|
+
if self.getParam('mas_manual_cert_mgmt') is True:
|
|
98
99
|
command += f" --manual-certificates \"{self.getParam('mas_manual_cert_dir')}\"{newline}"
|
|
99
100
|
|
|
100
101
|
if self.getParam('mas_enable_walkme') == "false":
|
|
@@ -201,170 +202,170 @@ class installArgBuilderMixin():
|
|
|
201
202
|
if self.getParam('mas_app_settings_server_timezone') != "":
|
|
202
203
|
command += f" --manage-server-timezone \"{self.getParam('mas_app_settings_server_timezone')}\"{newline}"
|
|
203
204
|
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
# Kafka - Strimzi & AMQ Streams
|
|
278
|
-
# -----------------------------------------------------------------------------
|
|
279
|
-
if self.getParam('kafka_namespace') != "":
|
|
280
|
-
command += f" --kafka-namespace \"{self.getParam('kafka_namespace')}\"{newline}"
|
|
281
|
-
if self.getParam('kafka_version') != "":
|
|
282
|
-
command += f" --kafka-version \"{self.getParam('kafka_version')}\"{newline}"
|
|
283
|
-
|
|
284
|
-
# Kafka - MSK
|
|
285
|
-
# -----------------------------------------------------------------------------
|
|
286
|
-
if self.getParam('aws_msk_instance_type') != "":
|
|
287
|
-
command += f" --msk-instance-type \"{self.getParam('aws_msk_instance_type')}\""
|
|
288
|
-
command += f" --msk-instance-nodes \"{self.getParam('aws_msk_instance_nodes')}\""
|
|
289
|
-
command += f" --msk-instance-volume-size \"{self.getParam('aws_msk_instance_volume_size')}\"{newline}"
|
|
290
|
-
|
|
291
|
-
command += f" --msk-cidr-az1 \"{self.getParam('aws_msk_cidr_az1')}\""
|
|
292
|
-
command += f" --msk-cidr-az2 \"{self.getParam('aws_msk_cidr_az1')}\""
|
|
293
|
-
command += f" --msk-cidr-az3 \"{self.getParam('aws_msk_cidr_az1')}\"{newline}"
|
|
294
|
-
|
|
295
|
-
command += f" --msk-cidr-egress \"{self.getParam('aws_msk_egress_cidr')}\""
|
|
296
|
-
command += f" --msk-cidr-ingress \"{self.getParam('aws_msk_ingress_cidr')}\"{newline}"
|
|
297
|
-
|
|
298
|
-
# Kafka - Event Streams
|
|
299
|
-
# -----------------------------------------------------------------------------
|
|
300
|
-
if self.getParam('eventstreams_instance_name') != "":
|
|
301
|
-
command += f" --eventstreams-resource-group \"{self.getParam('eventstreams_resource_group')}\""
|
|
302
|
-
command += f" --eventstreams-instance-name \"{self.getParam('eventstreams_instance_name')}\""
|
|
303
|
-
command += f" --eventstreams-instance-location \"{self.getParam('eventstreams_instance_location')}\"{newline}"
|
|
304
|
-
|
|
305
|
-
# COS
|
|
306
|
-
# -----------------------------------------------------------------------------
|
|
307
|
-
if self.getParam('cos_type') != "":
|
|
308
|
-
command += f" --cos \"{self.getParam('cos_type')}\""
|
|
309
|
-
if self.getParam('cos_resourcegroup') != "":
|
|
310
|
-
command += f" --cos-resourcegroup \"{self.getParam('cos_resourcegroup')}\""
|
|
311
|
-
command += newline
|
|
205
|
+
# IBM Cloud Pak for Data
|
|
206
|
+
# -----------------------------------------------------------------------------
|
|
207
|
+
if self.getParam('cpd_product_version') != "":
|
|
208
|
+
command += f" --cp4d-version \"{self.getParam('cpd_product_version')}\""
|
|
209
|
+
if self.getParam('cpd_install_spss') == "install":
|
|
210
|
+
command += " --cp4d-install-spss"
|
|
211
|
+
if self.getParam('cpd_install_openscale') == "install":
|
|
212
|
+
command += " --cp4d-install-openscal"
|
|
213
|
+
if self.getParam('cpd_install_cognos') == "install":
|
|
214
|
+
command += " --cp4d-install-cognos"
|
|
215
|
+
command += newline
|
|
216
|
+
|
|
217
|
+
# IBM Db2 Universal Operator
|
|
218
|
+
# -----------------------------------------------------------------------------
|
|
219
|
+
if self.getParam('db2_system') == "install" or self.getParam('db2_manage') == "install":
|
|
220
|
+
if self.getParam('db2_system') == "install":
|
|
221
|
+
command += f" --db2-system{newline}"
|
|
222
|
+
if self.getParam('db2_manage') == "install":
|
|
223
|
+
command += f" --db2-manage{newline}"
|
|
224
|
+
|
|
225
|
+
if self.getParam('db2_channel') != "":
|
|
226
|
+
command += f" --db2-channel \"{self.getParam('db2_channel')}\"{newline}"
|
|
227
|
+
if self.getParam('db2_namespace') != "":
|
|
228
|
+
command += f" --db2-namespace \"{self.getParam('db2_namespace')}\"{newline}"
|
|
229
|
+
|
|
230
|
+
if self.getParam('db2_type') != "":
|
|
231
|
+
command += f" --db2-type \"{self.getParam('db2_type')}\"{newline}"
|
|
232
|
+
if self.getParam('db2_timezone') != "":
|
|
233
|
+
command += f" --db2-timezone \"{self.getParam('db2_timezone')}\"{newline}"
|
|
234
|
+
|
|
235
|
+
if self.getParam('db2_affinity_key') != "":
|
|
236
|
+
command += f" --db2-affinity-key \"{self.getParam('db2_affinity_key')}\"{newline}"
|
|
237
|
+
if self.getParam('db2_affinity_value') != "":
|
|
238
|
+
command += f" --db2-affinity_value \"{self.getParam('db2_affinity_value')}\"{newline}"
|
|
239
|
+
|
|
240
|
+
if self.getParam('db2_tolerate_key') != "":
|
|
241
|
+
command += f" --db2-tolerate-key \"{self.getParam('db2_tolerate_key')}\"{newline}"
|
|
242
|
+
if self.getParam('db2_tolerate_value') != "":
|
|
243
|
+
command += f" --db2-tolerate-value \"{self.getParam('db2_tolerate_value')}\"{newline}"
|
|
244
|
+
if self.getParam('db2_tolerate_effect') != "":
|
|
245
|
+
command += f" --db2-tolerate-effect \"{self.getParam('db2_tolerate_effect')}\"{newline}"
|
|
246
|
+
|
|
247
|
+
if self.getParam('db2_cpu_requests') != "":
|
|
248
|
+
command += f" --db2-cpu-requests \"{self.getParam('db2_cpu_requests')}\"{newline}"
|
|
249
|
+
if self.getParam('db2_cpu_limits') != "":
|
|
250
|
+
command += f" --db2-cpu-limits \"{self.getParam('db2_cpu_limits')}\"{newline}"
|
|
251
|
+
|
|
252
|
+
if self.getParam('db2_memory_requests') != "":
|
|
253
|
+
command += f" --db2-memory-requests \"{self.getParam('db2_memory_requests')}\"{newline}"
|
|
254
|
+
if self.getParam('db2_memory_limits') != "":
|
|
255
|
+
command += f" --db2-memory-limits \"{self.getParam('db2_memory_limits')}\"{newline}"
|
|
256
|
+
|
|
257
|
+
if self.getParam('db2_backup_storage_size') != "":
|
|
258
|
+
command += f" --db2-backup-storage \"{self.getParam('db2_backup_storage_size')}\"{newline}"
|
|
259
|
+
if self.getParam('db2_data_storage_size') != "":
|
|
260
|
+
command += f" --db2-data-storage \"{self.getParam('db2_data_storage_size')}\"{newline}"
|
|
261
|
+
if self.getParam('db2_logs_storage_size') != "":
|
|
262
|
+
command += f" --db2-logs-storage \"{self.getParam('db2_logs_storage_size')}\"{newline}"
|
|
263
|
+
if self.getParam('db2_meta_storage_size') != "":
|
|
264
|
+
command += f" --db2-meta-storage \"{self.getParam('db2_meta_storage_size')}\"{newline}"
|
|
265
|
+
if self.getParam('db2_temp_storage_size') != "":
|
|
266
|
+
command += f" --db2-temp-storage \"{self.getParam('db2_temp_storage_size')}\"{newline}"
|
|
267
|
+
|
|
268
|
+
# Kafka - Common
|
|
269
|
+
# -----------------------------------------------------------------------------
|
|
270
|
+
if self.getParam('kafka_provider') != "":
|
|
271
|
+
command += f" --kafka-provider \"{self.getParam('kafka_provider')}\"{newline}"
|
|
272
|
+
|
|
273
|
+
if self.getParam('kafka_username') != "":
|
|
274
|
+
command += f" --kafka-username \"{self.getParam('kafka_username')}\"{newline}"
|
|
275
|
+
if self.getParam('kafka_password') != "":
|
|
276
|
+
command += f" --kafka-password $KAFKA_PASSWORD{newline}"
|
|
312
277
|
|
|
313
|
-
#
|
|
278
|
+
# Kafka - Strimzi & AMQ Streams
|
|
314
279
|
# -----------------------------------------------------------------------------
|
|
315
|
-
if self.getParam('
|
|
316
|
-
command += f" --
|
|
317
|
-
|
|
318
|
-
command += f" --
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
# Cloud Providers
|
|
280
|
+
if self.getParam('kafka_namespace') != "":
|
|
281
|
+
command += f" --kafka-namespace \"{self.getParam('kafka_namespace')}\"{newline}"
|
|
282
|
+
if self.getParam('kafka_version') != "":
|
|
283
|
+
command += f" --kafka-version \"{self.getParam('kafka_version')}\"{newline}"
|
|
284
|
+
|
|
285
|
+
# Kafka - MSK
|
|
323
286
|
# -----------------------------------------------------------------------------
|
|
324
|
-
if self.getParam('
|
|
325
|
-
command += f" --
|
|
287
|
+
if self.getParam('aws_msk_instance_type') != "":
|
|
288
|
+
command += f" --msk-instance-type \"{self.getParam('aws_msk_instance_type')}\""
|
|
289
|
+
command += f" --msk-instance-nodes \"{self.getParam('aws_msk_instance_nodes')}\""
|
|
290
|
+
command += f" --msk-instance-volume-size \"{self.getParam('aws_msk_instance_volume_size')}\"{newline}"
|
|
326
291
|
|
|
327
|
-
|
|
328
|
-
command += f"
|
|
329
|
-
|
|
330
|
-
command += f" --secret-access-key $SECRET_ACCESS_KEY{newline}"
|
|
331
|
-
command += f" --aws-region \"{self.getParam('aws_region')}\""
|
|
332
|
-
command += f" --aws-vpc-id \"{self.getParam('aws_vpc_id')}\""
|
|
292
|
+
command += f" --msk-cidr-az1 \"{self.getParam('aws_msk_cidr_az1')}\""
|
|
293
|
+
command += f" --msk-cidr-az2 \"{self.getParam('aws_msk_cidr_az1')}\""
|
|
294
|
+
command += f" --msk-cidr-az3 \"{self.getParam('aws_msk_cidr_az1')}\"{newline}"
|
|
333
295
|
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
if self.getParam('artifactory_username') != "":
|
|
337
|
-
command += f" --artifactory-username $ARTIFACTORY_USERNAME --artifactory-token $ARTIFACTORY_TOKEN{newline}"
|
|
296
|
+
command += f" --msk-cidr-egress \"{self.getParam('aws_msk_egress_cidr')}\""
|
|
297
|
+
command += f" --msk-cidr-ingress \"{self.getParam('aws_msk_ingress_cidr')}\"{newline}"
|
|
338
298
|
|
|
339
|
-
#
|
|
299
|
+
# Kafka - Event Streams
|
|
340
300
|
# -----------------------------------------------------------------------------
|
|
341
|
-
if self.getParam('
|
|
342
|
-
command += f" --
|
|
343
|
-
|
|
344
|
-
command += f"
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
301
|
+
if self.getParam('eventstreams_instance_name') != "":
|
|
302
|
+
command += f" --eventstreams-resource-group \"{self.getParam('eventstreams_resource_group')}\""
|
|
303
|
+
command += f" --eventstreams-instance-name \"{self.getParam('eventstreams_instance_name')}\""
|
|
304
|
+
command += f" --eventstreams-instance-location \"{self.getParam('eventstreams_instance_location')}\"{newline}"
|
|
305
|
+
|
|
306
|
+
# COS
|
|
307
|
+
# -----------------------------------------------------------------------------
|
|
308
|
+
if self.getParam('cos_type') != "":
|
|
309
|
+
command += f" --cos \"{self.getParam('cos_type')}\""
|
|
310
|
+
if self.getParam('cos_resourcegroup') != "":
|
|
311
|
+
command += f" --cos-resourcegroup \"{self.getParam('cos_resourcegroup')}\""
|
|
312
|
+
command += newline
|
|
313
|
+
|
|
314
|
+
# Turbonomic Integration
|
|
315
|
+
# -----------------------------------------------------------------------------
|
|
316
|
+
if self.getParam('turbonomic_target_name') != "":
|
|
317
|
+
command += f" --turbonomic-name \"{self.getParam('turbonomic_target_name')}\""
|
|
318
|
+
command += f" --turbonomic-url \"{self.getParam('turbonomic_server_url')}\""
|
|
319
|
+
command += f" --turbonomic-version \"{self.getParam('turbonomic_server_version')}\""
|
|
320
|
+
command += f" --turbonomic-username \"{self.getParam('turbonomic_username')}\""
|
|
321
|
+
command += f" --turbonomic-password \"{self.getParam('turbonomic_password')}\"{newline}"
|
|
322
|
+
|
|
323
|
+
# Cloud Providers
|
|
324
|
+
# -----------------------------------------------------------------------------
|
|
325
|
+
if self.getParam('ibmcloud_apikey') != "":
|
|
326
|
+
command += f" --ibmcloud-apikey $IBMCLOUD_APIKEY{newline}"
|
|
327
|
+
|
|
328
|
+
if self.getParam('aws_access_key_id') != "":
|
|
329
|
+
command += f" --aws-access-key-id $AWS_ACCESS_KEY_ID{newline}"
|
|
330
|
+
if self.getParam('secret_access_key') != "":
|
|
331
|
+
command += f" --secret-access-key $SECRET_ACCESS_KEY{newline}"
|
|
332
|
+
command += f" --aws-region \"{self.getParam('aws_region')}\""
|
|
333
|
+
command += f" --aws-vpc-id \"{self.getParam('aws_vpc_id')}\""
|
|
334
|
+
|
|
335
|
+
# Development Mode
|
|
336
|
+
# -----------------------------------------------------------------------------
|
|
337
|
+
if self.getParam('artifactory_username') != "":
|
|
338
|
+
command += f" --artifactory-username $ARTIFACTORY_USERNAME --artifactory-token $ARTIFACTORY_TOKEN{newline}"
|
|
339
|
+
|
|
340
|
+
# Approvals
|
|
341
|
+
# -----------------------------------------------------------------------------
|
|
342
|
+
if self.getParam('approval_core') != "":
|
|
343
|
+
command += f" --approval-core \"{self.getParam('approval_core')}\"{newline}"
|
|
344
|
+
if self.getParam('approval_assist') != "":
|
|
345
|
+
command += f" --approval-assist \"{self.getParam('approval_assist')}\"{newline}"
|
|
346
|
+
if self.getParam('approval_iot') != "":
|
|
347
|
+
command += f" --approval-iot \"{self.getParam('approval_iot')}\"{newline}"
|
|
348
|
+
if self.getParam('approval_manage') != "":
|
|
349
|
+
command += f" --approval-manage \"{self.getParam('approval_manage')}\"{newline}"
|
|
350
|
+
if self.getParam('approval_monitor') != "":
|
|
351
|
+
command += f" --approval-monitor \"{self.getParam('approval_monitor')}\"{newline}"
|
|
352
|
+
if self.getParam('approval_optimizer') != "":
|
|
353
|
+
command += f" --approval-optimizer \"{self.getParam('approval_optimizer')}\"{newline}"
|
|
354
|
+
if self.getParam('approval_predict') != "":
|
|
355
|
+
command += f" --approval-predict \"{self.getParam('approval_predict')}\"{newline}"
|
|
356
|
+
if self.getParam('approval_visualinspection') != "":
|
|
357
|
+
command += f" --approval-visualinspection \"{self.getParam('approval_visualinspection')}\"{newline}"
|
|
358
|
+
|
|
359
|
+
# More Options
|
|
360
|
+
# -----------------------------------------------------------------------------
|
|
361
|
+
if self.devMode:
|
|
362
|
+
command += f" --dev-mode{newline}"
|
|
363
|
+
if not self.waitForPVC:
|
|
364
|
+
command += f" --no-wait-for-pvc{newline}"
|
|
365
|
+
if self.getParam('skip_pre_check') is True:
|
|
366
|
+
command += f" --skip-pre-check{newline}"
|
|
367
|
+
if self.getParam('skip_grafana_install') is True:
|
|
368
|
+
command += f" --skip-grafana-install{newline}"
|
|
368
369
|
|
|
369
370
|
command += " --accept-license --no-confirm"
|
|
370
371
|
return command
|
mas/cli/install/argParser.py
CHANGED
|
@@ -14,12 +14,14 @@ from os import path
|
|
|
14
14
|
from .. import __version__ as packageVersion
|
|
15
15
|
from ..cli import getHelpFormatter
|
|
16
16
|
|
|
17
|
+
|
|
17
18
|
def isValidFile(parser, arg) -> str:
|
|
18
19
|
if not path.exists(arg):
|
|
19
20
|
parser.error(f"Error: The file {arg} does not exist")
|
|
20
21
|
else:
|
|
21
22
|
return arg
|
|
22
23
|
|
|
24
|
+
|
|
23
25
|
installArgParser = argparse.ArgumentParser(
|
|
24
26
|
prog="mas install",
|
|
25
27
|
description="\n".join([
|
|
@@ -75,7 +77,7 @@ masArgGroup.add_argument(
|
|
|
75
77
|
required=False,
|
|
76
78
|
help="Subscription channel for the Core Platform"
|
|
77
79
|
)
|
|
78
|
-
# MAS Special characters
|
|
80
|
+
# MAS Special characters
|
|
79
81
|
# -----------------------------------------------------------------------------
|
|
80
82
|
masSpecialCharacters = installArgParser.add_argument_group("Mas Special Characters")
|
|
81
83
|
masSpecialCharacters.add_argument(
|
|
@@ -14,8 +14,9 @@ from .manageSettings import ManageSettingsMixin
|
|
|
14
14
|
from .turbonomicSettings import TurbonomicSettingsMixin
|
|
15
15
|
from .additionalConfigs import AdditionalConfigsMixin
|
|
16
16
|
|
|
17
|
+
|
|
17
18
|
class InstallSettingsMixin(Db2SettingsMixin, KafkaSettingsMixin, ManageSettingsMixin, TurbonomicSettingsMixin, AdditionalConfigsMixin):
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
19
|
+
"""
|
|
20
|
+
This class collects all the Mixins providing interactive prompts for mas-install
|
|
21
|
+
"""
|
|
22
|
+
pass
|
|
@@ -16,6 +16,7 @@ from prompt_toolkit import print_formatted_text
|
|
|
16
16
|
import logging
|
|
17
17
|
logger = logging.getLogger(__name__)
|
|
18
18
|
|
|
19
|
+
|
|
19
20
|
class AdditionalConfigsMixin():
|
|
20
21
|
def additionalConfigs(self) -> None:
|
|
21
22
|
if self.interactiveMode:
|
|
@@ -136,40 +137,40 @@ class AdditionalConfigsMixin():
|
|
|
136
137
|
|
|
137
138
|
apps = {
|
|
138
139
|
"mas_app_channel_assist": {
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
140
|
+
"dir": self.getParam("mas_manual_cert_dir") + "/assist/",
|
|
141
|
+
"keyPrefix": "assist."
|
|
142
|
+
},
|
|
142
143
|
"mas_app_channel_manage": {
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
144
|
+
"dir": self.getParam("mas_manual_cert_dir") + "/manage/",
|
|
145
|
+
"keyPrefix": "manage."
|
|
146
|
+
},
|
|
146
147
|
"mas_app_channel_iot": {
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
148
|
+
"dir": self.getParam("mas_manual_cert_dir") + "/iot/",
|
|
149
|
+
"keyPrefix": "iot."
|
|
150
|
+
},
|
|
150
151
|
"mas_app_channel_monitor": {
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
152
|
+
"dir": self.getParam("mas_manual_cert_dir") + "/monitor/",
|
|
153
|
+
"keyPrefix": "monitor."
|
|
154
|
+
},
|
|
154
155
|
"mas_app_channel_predict": {
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
156
|
+
"dir": self.getParam("mas_manual_cert_dir") + "/predict/",
|
|
157
|
+
"keyPrefix": "predict."
|
|
158
|
+
},
|
|
158
159
|
"mas_app_channel_visualinspection": {
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
160
|
+
"dir": self.getParam("mas_manual_cert_dir") + "/visualinspection/",
|
|
161
|
+
"keyPrefix": "visualinspection."
|
|
162
|
+
},
|
|
162
163
|
"mas_app_channel_optimizer": {
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
}
|
|
164
|
+
"dir": self.getParam("mas_manual_cert_dir") + "/optimizer/",
|
|
165
|
+
"keyPrefix": "optimizer."
|
|
166
166
|
}
|
|
167
|
+
}
|
|
167
168
|
|
|
168
169
|
for file in ["ca.crt", "tls.crt", "tls.key"]:
|
|
169
170
|
if file not in map(path.basename, glob(f'{self.getParam("mas_manual_cert_dir")}/core/*')):
|
|
170
171
|
self.fatalError(f'{file} is not present in {self.getParam("mas_manual_cert_dir")}/core/')
|
|
171
172
|
for ext in extensions:
|
|
172
|
-
certsSecret = self.addFilesToSecret(certsSecret, self.getParam("mas_manual_cert_dir")+'/core/', ext, "core.")
|
|
173
|
+
certsSecret = self.addFilesToSecret(certsSecret, self.getParam("mas_manual_cert_dir") + '/core/', ext, "core.")
|
|
173
174
|
|
|
174
175
|
for app in apps:
|
|
175
176
|
if self.getParam(app) != "":
|
|
@@ -181,7 +182,7 @@ class AdditionalConfigsMixin():
|
|
|
181
182
|
|
|
182
183
|
self.certsSecret = certsSecret
|
|
183
184
|
|
|
184
|
-
def addFilesToSecret(self, secretDict: dict, configPath: str, extension: str, keyPrefix: str='') -> dict:
|
|
185
|
+
def addFilesToSecret(self, secretDict: dict, configPath: str, extension: str, keyPrefix: str = '') -> dict:
|
|
185
186
|
"""
|
|
186
187
|
Add file (or files) to pipeline-additional-configs
|
|
187
188
|
"""
|
|
@@ -206,4 +207,4 @@ class AdditionalConfigsMixin():
|
|
|
206
207
|
secretDict["data"] = {}
|
|
207
208
|
secretDict["data"][keyPrefix + fileName] = b64encode(data.encode('ascii')).decode("ascii")
|
|
208
209
|
|
|
209
|
-
return secretDict
|
|
210
|
+
return secretDict
|
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
from os import path
|
|
12
12
|
from prompt_toolkit import print_formatted_text
|
|
13
13
|
|
|
14
|
+
|
|
14
15
|
class Db2SettingsMixin():
|
|
15
16
|
def configDb2(self) -> None:
|
|
16
17
|
self.printH1("Configure Databases")
|
|
@@ -123,9 +124,8 @@ class Db2SettingsMixin():
|
|
|
123
124
|
else:
|
|
124
125
|
self.setParam("db2_action_manage", "none")
|
|
125
126
|
|
|
126
|
-
|
|
127
127
|
# Do we need to configure Db2u?
|
|
128
|
-
if self.getParam("db2_action_system")
|
|
128
|
+
if self.getParam("db2_action_system") == "install" or self.getParam("db2_action_manage") == "install":
|
|
129
129
|
self.printH2("Installation Namespace")
|
|
130
130
|
self.promptForString("Install namespace", "db2_namespace", default="db2u")
|
|
131
131
|
|
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
import logging
|
|
12
12
|
logger = logging.getLogger(__name__)
|
|
13
13
|
|
|
14
|
+
|
|
14
15
|
class ManageSettingsMixin():
|
|
15
16
|
|
|
16
17
|
def arcgisSettings(self) -> None:
|
|
@@ -75,24 +76,42 @@ class ManageSettingsMixin():
|
|
|
75
76
|
self.params["mas_appws_components"] = "base=latest,health=latest"
|
|
76
77
|
if self.yesOrNo("Select components to enable"):
|
|
77
78
|
self.params["mas_appws_components"] = "base=latest"
|
|
78
|
-
if self.yesOrNo(" - Asset Configuration Manager"):
|
|
79
|
-
|
|
80
|
-
if self.yesOrNo(" -
|
|
81
|
-
|
|
82
|
-
if self.yesOrNo(" -
|
|
83
|
-
|
|
84
|
-
if self.yesOrNo(" -
|
|
85
|
-
|
|
86
|
-
if self.yesOrNo(" -
|
|
87
|
-
|
|
88
|
-
if self.yesOrNo(" -
|
|
89
|
-
|
|
90
|
-
if self.yesOrNo(" -
|
|
91
|
-
|
|
92
|
-
if self.yesOrNo(" -
|
|
93
|
-
|
|
94
|
-
if self.yesOrNo(" -
|
|
95
|
-
|
|
79
|
+
if self.yesOrNo(" - Asset Configuration Manager"):
|
|
80
|
+
self.params["mas_appws_components"] += ",acm=latest"
|
|
81
|
+
if self.yesOrNo(" - Aviation"):
|
|
82
|
+
self.params["mas_appws_components"] += ",acm=latest"
|
|
83
|
+
if self.yesOrNo(" - Civil Infrastructure"):
|
|
84
|
+
self.params["mas_appws_components"] += ",civil=latest"
|
|
85
|
+
if self.yesOrNo(" - Envizi"):
|
|
86
|
+
self.params["mas_appws_components"] += ",envizi=latest"
|
|
87
|
+
if self.yesOrNo(" - Health"):
|
|
88
|
+
self.params["mas_appws_components"] += ",health=latest"
|
|
89
|
+
if self.yesOrNo(" - Health, Safety and Environment"):
|
|
90
|
+
self.params["mas_appws_components"] += ",hse=latest"
|
|
91
|
+
if self.yesOrNo(" - Maximo IT"):
|
|
92
|
+
self.params["mas_appws_components"] += ",icd=latest"
|
|
93
|
+
if self.yesOrNo(" - Nuclear"):
|
|
94
|
+
self.params["mas_appws_components"] += ",nuclear=latest"
|
|
95
|
+
if self.yesOrNo(" - Oil & Gas"):
|
|
96
|
+
self.params["mas_appws_components"] += ",oilandgas=latest"
|
|
97
|
+
if self.yesOrNo(" - Connector for Oracle Applications"):
|
|
98
|
+
self.params["mas_appws_components"] += ",oracleadapter=latest"
|
|
99
|
+
if self.yesOrNo(" - Connector for SAP Application"):
|
|
100
|
+
self.params["mas_appws_components"] += ",sapadapter=latest"
|
|
101
|
+
if self.yesOrNo(" - Service Provider"):
|
|
102
|
+
self.params["mas_appws_components"] += ",serviceprovider=latest"
|
|
103
|
+
if self.yesOrNo(" - Spatial"):
|
|
104
|
+
self.params["mas_appws_components"] += ",spatial=latest"
|
|
105
|
+
if self.yesOrNo(" - Strategize"):
|
|
106
|
+
self.params["mas_appws_components"] += ",strategize=latest"
|
|
107
|
+
if self.yesOrNo(" - Transportation"):
|
|
108
|
+
self.params["mas_appws_components"] += ",transportation=latest"
|
|
109
|
+
if self.yesOrNo(" - Tririga"):
|
|
110
|
+
self.params["mas_appws_components"] += ",tririga=latest"
|
|
111
|
+
if self.yesOrNo(" - Utilities"):
|
|
112
|
+
self.params["mas_appws_components"] += ",utilities=latest"
|
|
113
|
+
if self.yesOrNo(" - Workday Applications"):
|
|
114
|
+
self.params["mas_appws_components"] += ",workday=latest"
|
|
96
115
|
logger.debug(f"Generated mas_appws_components = {self.params['mas_appws_components']}")
|
|
97
116
|
|
|
98
117
|
if ",icd=" in self.params["mas_appws_components"]:
|
|
@@ -154,7 +173,7 @@ class ManageSettingsMixin():
|
|
|
154
173
|
else:
|
|
155
174
|
self.fatalError("Invalid selection")
|
|
156
175
|
|
|
157
|
-
def manageSettingsJMS
|
|
176
|
+
def manageSettingsJMS(self) -> None:
|
|
158
177
|
if self.getParam("mas_app_settings_server_bundles_size") in ["jms", "snojms"]:
|
|
159
178
|
self.printDescription([
|
|
160
179
|
"Only Manage JMS sequential queues (sqin and sqout) are enabled by default.",
|