Skip to content

Commit 75869bc

Browse files
Jonathan ZakJonathan Zak
Jonathan Zak
authored and
Jonathan Zak
committed
Address pr comments
1 parent 85233ff commit 75869bc

File tree

2 files changed

+4
-16
lines changed

2 files changed

+4
-16
lines changed

docs/guides/configuration.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Before you can make serious use of Merlin, you have to setup a number of things.
66
* **Credentials** your user and password and/or SSH keys belong here
77
* **Templates** are used to connect a defined inventory and credentials together
88

9-
You can setup inventories, connections and templates by following the instructions in [Connections](./guides/platform/Manage_connections.md).
9+
You can setup inventories, credentials and templates by following the instructions in [Connections](./guides/platform/Manage_connections.md).
1010
<!-- But of course, you have to register to your Merlin instance first.
1111
1212
## Setting up Your Inventory (IBM i)
@@ -42,7 +42,7 @@ Head to the Templates tab and select Add.
4242
Fill out the required fields. The Inventory and Credential dropdowns only show you the items you have access to. You can give this Template another unique name, as well as custom description.
4343
4444
![](../images/home/home-5.png) -->
45-
### Verifying the template
45+
### Configuring IBM i server
4646

4747
After an IBM i template has been created, the provided Ansible playbooks should be run to ensure the IBM i has the required software to allow for smooth interaction with Merlin.
4848

docs/guides/openshift/merlininstall.md

+2-14
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,9 @@
11

22
This guide assumes RedHat OpenShift is running, which will allow for the install of IBM i Merlin.
33

4-
# Merlin Requirements
4+
## Supported product versions and OpenShift requirements
55

6-
IBM i Modernization Engine for Lifecycle Integration can be [installed from either OpenShift web console](docs/guides/openshift/merlininstall.md) or CLI (`oc` command).
7-
8-
## Supported product versions
9-
10-
See [Supported product versions](./guides/platform/Install_IBM_i_Modernization_Engine_for_Lifecycle_Integration.md).
11-
12-
## Required OpenShift resources
13-
14-
| Name | CPU Request | CPU Limit | Memory Request | Memory Limit | Note |
15-
|----------------------|-------------|-----------|----------------|--------------|-----------------------------------|
16-
| Merlin | 2.5 | 5 | 7Gi | 15Gi | |
17-
| IBM i Developer Tool | 0.5 | 2.7 | 1.5 | 3Gi | The resource is per each instance |
18-
| IBM i CI/CD | 0.5 | 1 | 1Gi | 2Gi | The resource is per each instance |
6+
See [Supported product versions and OpenShift requirements](./guides/platform/Install_IBM_i_Modernization_Engine_for_Lifecycle_Integration.md).
197

208
> **Meaning of a instance for IBM i Developer and IBM i CI/CD tools:** If admin installs one of these two tools in a OpenShift project, that means one instance.\
219
> **Unit of CPU:** CPU is measured in units called millicores. If a node has 2 cores, the node’s CPU capacity would be represented as 2000m.\

0 commit comments

Comments
 (0)