Skip to content

Commit 0664449

Browse files
authored
Merge pull request #44 from IBM/fix/img-tags
Fix images with `img` tags not displaying
2 parents d44d2bb + 7e38252 commit 0664449

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed

docs/guides/platform/Forgot_Password.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,56 +7,56 @@ This document simply describes how to set up the Email configurations and enable
77
Step 1, Go to the project which installed Merlin
88
Go to the Openshift GUI, **Home** -> **Projects** -> click specific project
99

10-
<img src="../../images/guides/forgotp1.png" width = "800" height = "600" alt="Projects" align=center />
10+
![Projects](../../images/guides/forgotp1.png ':size=800')
1111

1212
Step 2, Get the credential of keycloak
1313
**Workloads** -> **Secrets** -> click **merlin-credential-secret** in the table
1414

15-
<img src="../../images/guides/forgotp2.png" width = "800" height = "600" alt="Secrets" align=center />
15+
![Secrets](../../images/guides/forgotp2.png ':size=800')
1616

1717
Get **ADMIN_USERNAME** and **ADMIN_PASSWORD**
1818

19-
<img src="../../images/guides/forgotp3.png" width = "800" height = "600" alt="admin_password" align=center />
19+
![Admin Password](../../images/guides/forgotp3.png ':size=800')
2020

2121
Step 3, Find the route of keycloak
2222
**Networking** -> **Routes** -> Click the Location link in the keykloak item. It will open the Keycloak GUI.
2323

24-
<img src="../../images/guides/forgotp4.png" width = "800" height = "600" alt="Route" align=center />
24+
![Route](../../images/guides/forgotp4.png ':size=800')
2525

2626
Step 4, Login
2727
Click the **Administration Console**.
2828

29-
<img src="../../images/guides/forgotp5.png" width = "800" height = "600" alt="Console" align=center />
29+
![Console](../../images/guides/forgotp5.png ':size=800')
3030

3131
Login with **ADMIN_USERNAME** and **ADMIN_PASSWORD**
3232

33-
<img src="../../images/guides/forgotp6.png" width = "800" height = "600" alt="login_1" align=center />
33+
![Login](../../images/guides/forgotp6.png ':size=800')
3434

3535
Step 5, Set up Email
3636
**Realm Settings** -> Click **Email** tab -> enter the necessary info -> Click Save button.
3737

38-
<img src="../../images/guides/forgotp7.png" width = "800" height = "600" alt="login_2" align=center />
38+
![Keycloak Config](../../images/guides/forgotp7.png ':size=800')
3939

4040
Step 6, Enable Forgot Password
4141
**Realm Settings** -> Click **Login** tab -> enable the Forgot Password -> click Save button.
4242

43-
<img src="../../images/guides/forgotp8.png" width = "800" height = "600" alt="login_3" align=center />
43+
![Forgot Password](../../images/guides/forgotp8.png ':size=800')
4444

4545
Step 7, Verify the Forgot Password was enabled
4646
Go to the Merlin login page -> click **Forgot Password**
4747

48-
<img src="../../images/guides/forgotp9.png" width = "800" height = "600" alt="login_4" align=center />
48+
![Forgot Password](../../images/guides/forgotp9.png ':size=800')
4949

5050
Enter the username or email address -> click Submit.
5151

52-
<img src="../../images/guides/forgotp10.png" width = "800" height = "600" alt="username" align=center />
52+
![Username or Email](../../images/guides/forgotp10.png ':size=800')
5353

5454
Note: please make sure this account has set up a valid email address in profile, or this account could not receive emails.
5555
Received a Reset Password Email.
5656

57-
<img src="../../images/guides/forgotp11.png" width = "800" height = "600" alt="reset" align=center />
57+
![Reset Password Email](../../images/guides/forgotp11.png ':size=800')
5858

5959
Step 8, Reset password
6060
Click the link to reset credentials in the Email -> enter the new password -> click submit, then the password will be reset.
6161

62-
<img src="../../images/guides/forgotp12.png" width = "800" height = "600" alt="submit" align=center />
62+
![Submit](../../images/guides/forgotp12.png ':size=800')

docs/guides/platform/ManageCredential.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ The Credentials manage the credential info used for Merlin. It will save the cre
33

44
Go to Merlin GUI and select **Connections -> Credentials** to go to the Credentials page.
55

6-
<img src="../../images/guides/Credentials.png" width = "800" height = "500" alt="Credential" align=center />
6+
![Credentials Page](../../images/guides/Credentials.png ':size=800')
77

88
An admin will see all credentials, but a user will only see credentials which they own. It will display the `Name`, `Type`, `Description`, `Owner`, `Created Time`, and `Updated Time`.
99

1010
- **Add Credential** - Click the `+ Add` button and enter the `Name` and `Type`. After the type is selected, the required fields will updated. For example, if `IBM i` is the selected type, users must enter the `username` and `password` of the IBM i server or the `+ Add` button will be disabled. Optionally, ssh key information can be specified. If specified, the ssh key will be used instead of the password to connect to the IBM i during the IDE developer build process. Specify all the necessary fields and click the `+ Add` button so then the new credential record will be imported to the Credentials table.
1111

1212
**Note**: If using ssh key, additional configuration is performed during connection to the IBM i before the build starts.
1313

14-
<img src="../../images/guides/AddCredentials.png" width = "600" height = "300" alt="Add Credential" align=center />
14+
![Add Credential](../../images/guides/AddCredentials.png ':size=600')
1515

1616
- **Delete Credentials** - The `Delete` button is disabled by default. Selecting items in the credential table will highlight them and also enable the `Delete` button. Click the `Delete` button and click `Yes` to the confirmation to delete all selected items.
1717

docs/guides/platform/ManageInventory.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
The Inventory manages the systems information used for Merlin. It will save the general system information including hostname, type, description and some other information. The detailed inventory info will be changed according to the inventory type. Merlin supports four types of hosts: `IBM i`, `IBM PowerVC`, `IBM Cloud`, and `Jenkins`.
33

44
Go to Merlin GUI and select **Connections -> Inventory** to go to the Inventory page.
5-
6-
<img src="../../images/guides/Addinventory0.png" width = "800" height = "500" alt="Inventory" align=center />
5+
6+
![Inventory Page](../../images/guides/Addinventory0.png ':size=800')
77

88
All the inventories which the user created or has permission to will be shown. It will display the `Name`, `Hostname`, `Type`, `Description`, `Owner`, `Provision`, `Created Time`, and `Updated Time`. The `Provision` item is a tag that specifies the IBM i server deployed by the Power VC template.
99

1010
- **Add Inventory** - Click the `+ Add` button and enter the `Name`, `Type` and `Hostname`. After the type is selected, the required fields will updated. If one of requirements are not meet, the `+ Add` button will stay disabled. Specify all the necessary fields and click the `+ Add` button so then the new inventory record will be imported to the Inventory table.
1111

12-
<img src="../../images/guides/Addinventory.png" width = "400" height = "250" alt="Add Inventory" align=center />
12+
![Add Inventory](../../images/guides/Addinventory.png ':size=600')
1313

1414
For secure connections, Merlin supports the `Test TLS` function which allows customers to accept the remote CA such as for a Power VC Inventory. After specifying the `Hostname` and `Port`, the `Test TLS` button will be enabled and it will catch the Power VC CA. In the detailed certificate windows, click the `Accept` button. Then this CA be added to the Merlin trust store.
1515

16-
<img src="../../images/guides/Pvcinventory.png" width = "400" height = "300" alt="Add power vc inventory" align=center />
16+
![Add Power VC Inventory](../../images/guides/Pvcinventory.png ':size=600')
1717

18-
**Note:** For the `Name` field, please avoid the use of the special characters .,:;/\"*?<>|=+&%'\`@". The `Hostname` field supports `IP`, `Hostname`, and `URL`.
18+
**Note:** For the `Name` field, please avoid the use of the special characters .,:;/\"*?<>|=+&%'\`@". The `Hostname` field supports `IP`, `Hostname`, and `URL`.
1919

2020
- **Delete Inventory** - The `Delete` button is disabled by default. Selecting items in the inventory table will highlight them and also enable the `Delete` button. Click the `Delete` button and click `Yes` to the confirmation to delete all selected items.
2121

docs/guides/platform/ManageTemplates.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@ The Templates manage the template info used for Merlin. It will save the templat
33

44
Go to Merlin GUI and select **Connections -> Templates** to go to the Templates page.
55

6-
<img src="../../images/guides/Templates.png" width = "800" height = "500" alt="Templates" align=center />
6+
![Templates Page](../../images/guides/Templates.png ':size=800')
77

88
An admin will see all templates, but the `Run` button will only work on templates which they own. A user will only see templates which they own. It will display the `Name`, `Inventory`, `Credential`, `Type`, `Owner`, `Created Time`, and `Updated Time` by default. Users can also customize the columns by clicking the icon at the top right of the table.
99

1010
- **Add Template** - Click the `+ Add` button and enter the `Name` and select an inventory. The `type` will be automatically populated to be the same as the inventory type. The listed credentials to select from will also be filtered to match the same type. After the type is set, the required fields will updated. For example, if `IBM PowerVC` is the set type, users must enter the vm info which is used in this template or the `+ Add` button will be disabled. Specify all the necessary fields and click the `+ Add` button so then the new template record will be imported to the Templates table.
1111

12-
<img src="../../images/guides/PvcTemplate.png" width = "600" height = "400" alt="Add Templates" align=center />
12+
![Add Template](../../images/guides/PvcTemplate.png ':size=600')
1313

1414
- **Delete Templates** - The `Delete` button is disabled by default. Selecting items in the credential table will highlight them and also enable the `Delete` button. Click the `Delete` button and click `Yes` to the confirmation to delete all selected items.
1515

1616
- **Edit Template** - The `Edit` button is disabled by default. Selecting one item in the template table will highlight it and also enable the `Edit` button. Click the `Edit` button to see the template info. All fields may edited except the `owner`.
1717

1818
- **Run Template** - The `Run` button is disabled by default. Selecting one item in the template table will highlight it and also enable the `Run` button. According to the different templates type, the available actions will be different. For a Power VC template, Merlin supports the Provision actions which will help the user to deploy a new IBM VM. The user should make sure all the hardware configurations have been set up on the Power VC side.
1919

20-
<img src="../../images/guides/PvcAction.png" width = "600" height = "200" alt="Power VC Templates Action" align=center />
20+
![Power VC Template Actions](../../images/guides/PvcAction.png ':size=800')
2121

2222
For the IBM i server template, Merlin supports `Enable Ansible environment`, `Validate the dependent PTFs`, `Install Certificate`, `Enable IBM i developer environment`, `Enable IBM i Debug Service`, and `Enable ARCAD environment`.
2323

24-
<img src="../../images/guides/IAction.png" width = "600" height = "200" alt="IBM i Templates Action" align=center />
24+
![IBM i Template Actions](../../images/guides/IAction.png ':size=800')
2525

2626
- **Refresh Templates** - Click the `Refresh` button for the Merlin GUI to retrieve the latest template info.

0 commit comments

Comments
 (0)