Skip to content

Commit 720fdc1

Browse files
FryguyFryguy
committed
Merge remote-tracking branch 'origin/master' into spassky
2 parents 000826a + 9ffd62b commit 720fdc1

File tree

9 files changed

+89
-41
lines changed

9 files changed

+89
-41
lines changed

‎_includes/installing-vmware-webmks-containers.md

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
### Installing VMware WebMKS on containers
2+
3+
VMware vSphere Virtual Machine Remote console access requires the installation of the VMware WebMKS SDK.
4+
Due to license restrictions this SDK cannot be built in to {{ site.data.product.title_short }}
5+
6+
To install the WebMKS SDK on containers we can take an existing container and create another layer on top of it. Once built, this image will need to be pushed to a registry and the CR updated to reflect that.
7+
8+
1. Download the latest WebMKS version (e.g. `WebMKS_SDK_{version}.zip`) from the VMware website.
9+
10+
2. Set up a temporary directory where we will build the image
11+
12+
```bash
13+
$ mkdir -p /tmp/webmks_container/container-assets
14+
```
15+
16+
3. Copy the tar file into the container-assets directory. For example,
17+
18+
```bash
19+
$ unzip ~/Downloads/WebMKS_SDK_*.zip -d /tmp/webmks_container/container-assets
20+
```
21+
22+
4. Add the following Dockerfile as `/tmp/webmks_container/Dockerfile` and substitute the second `FROM` based on the image and version that you're running.
23+
24+
```dockerfile
25+
FROM registry.access.redhat.com/ubi8/ubi as webmks
26+
27+
COPY container-assets/ /webmks/
28+
29+
################################################################################
30+
31+
### IMPORTANT: Modify the following image and tag as necessary to reflect the version that you're running
32+
FROM your_registry.example.com/namespace/manageiq-ui-worker:latest
33+
34+
COPY --from=webmks /webmks/ /var/www/miq/vmdb/public/webmks
35+
```
36+
37+
5. Build the image and tag it appropriately for your registry, then push it to the registry.
38+
39+
```bash
40+
$ cd /tmp/webmks_container/
41+
$ docker build . -t your_registry.example.com/namespace/manageiq-ui-worker:latest_webmks
42+
$ docker push your_registry.example.com/namespace/manageiq-ui-worker:latest_webmks
43+
```
44+
45+
6. Update the CR to use the UI worker image you just pushed to the registry.
46+
47+
```yaml
48+
uiWorkerImage: your_registry.example.com/namespace/manageiq-ui-worker:latest_webmks
49+
```
50+
51+
The operator will now update the orchestrator and worker deployments to reflect this change.

‎_includes/installing-vmware-webmks.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
## Installing VMware WebMKS on appliances
2+
3+
VMware vSphere Virtual Machine Remote console access requires the installation of the VMware WebMKS SDK.
4+
Due to license restrictions this SDK cannot be built in to {{ site.data.product.title_short }}
5+
6+
1. Log in to the {{ site.data.product.title_short }} user interface appliance
7+
console as the root user.
8+
9+
2. On the {{ site.data.product.title_short }} user interface appliances, create a
10+
folder titled `webmks` in the `/var/www/miq/vmdb/public/` directory.
11+
12+
/var/www/miq/vmdb/public/webmks
13+
14+
3. Download and extract the contents of [VMware WebMKS
15+
SDK](https://www.vmware.com/support/developer/html-console/) into
16+
the `webmks` folder.

‎api/reference/services.md

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ Full CRUD is available on service catalogs.
2020

2121
- [Editing Service Catalogs](#editing-service-catalogs)
2222

23-
- [Assigning/Unassigning Service Templates from Service
24-
Catalogs](#assigning-service-template)
23+
- [Assigning Service Templates](#assigning-service-templates)
2524

2625
- [Ordering Services](#ordering-services)
2726

@@ -122,7 +121,7 @@ the *assign* and *unassign* actions as follows:
122121
}
123122
```
124123

125-
#### Ordering Services Service Templates
124+
#### Ordering Services
126125

127126
Ordering services is done by triggering an *order* action on service
128127
templates in a service catalog as follows:
@@ -330,7 +329,7 @@ Multiple service templates can also be deleted in bulk as follows:
330329
}
331330
```
332331

333-
### Services ===
332+
### Services
334333

335334
Accessing services is via the **services** collection as follows:
336335

@@ -344,7 +343,7 @@ or addressing an individual Service via the **services** resource:
344343
/api/services/:id
345344
```
346345

347-
#### Creating Services ====
346+
#### Creating Services
348347

349348
In general, services are created once ordered from service catalogs.
350349

@@ -373,7 +372,7 @@ an existing service.
373372
Please refer to the [Resource Attributes](../appendices/resource_attributes.html#services) page for a
374373
list of available attributes when creating Services.
375374

376-
#### Service Actions ====
375+
#### Service Actions
377376

378377
Once services are ordered from a catalog, they can be:
379378

@@ -385,23 +384,21 @@ Once services are ordered from a catalog, they can be:
385384

386385
- [Reconfigured](#service-reconfiguring)
387386

388-
- [Started](#service-started)
387+
- [Started](#starting-services)
389388

390-
- [Stopped](#service-stopped)
389+
- [Stopped](#stopping-services)
391390

392-
- [Suspended](#service-suspended)
391+
- [Suspended](#suspending-services)
393392

394-
- [Deleted](#service-deleting)
393+
- [Deleted](#deleting-services)
395394

396395
Additional Service actions include:
397396

398-
- [Adding and Removing Resources from
399-
Services](#service-add-remove-resources)
397+
- [Adding and Removing Resources from Services](#adding-and-removing-resources-from-services)
400398

401-
- [Adding Provider VMs to Services](#service-add-provider-vms)
399+
- [Adding Provider VMs to Services](#adding-provider-vms-to-services)
402400

403-
- [Requesting a Chargeback Report for a
404-
Service](#service-queue-chargeback-report)
401+
- [Requesting a Chargeback Report for a Service](#requesting-a-chargeback-report-for-a-service)
405402

406403
Other than service creates and edits, service actions return the action
407404
response as in the following example:
@@ -702,18 +699,15 @@ Or via the delete action for deleting multiple services:
702699
}
703700
```
704701

705-
### Service Requests ===
702+
### Service Requests
706703

707704
- [Querying Service Requests](#querying-service-requests)
708705

709-
- [Approving or Denying Service
710-
Requests](#approving-denying-service-requests)
706+
- [Approving or Denying ServiceRequests](#approving-or-denying-service-requests)
711707

712-
- [Adding Approvers to Service
713-
Requests](#adding-approvers-service-requests)
708+
- [Adding Approvers to Service Requests](#adding-approvers-to-service-requests)
714709

715-
- [Removing Approvers to Service
716-
Requests](#removing-approvers-service-requests)
710+
- [Removing Approvers to Service Requests](#removing-approvers-to-service-requests)
717711

718712
- [Editing Request Tasks](#editing-request-tasks)
719713

‎capabilities_matrix/_topics/infrastructure_providers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
|   • Sysprep Windows Templates | ✅ | ✅ | ❌ | ❌ | ❌ |
4747
|   • Cloud-init | ❌ | ✅ | ❌ | ❌ | ❌ |
4848
| VM Retirement | ✅ | ✅ | ❌ | ✅ | ✅ |
49-
| VM Reconfiguration | ✅ | ✅ | ❌ | ❌ | ❌ |
49+
| VM Reconfiguration | ✅ | ✅ | ❌ | ❌ | ✅ |
5050
|   • Disk Addition | ✅ | ✅ | ❌ | ❌ | ❌ |
5151
|   • Network Interface Add/Remove | ✅ | ✅ | ❌ | ❌ | ❌ |
5252
| VM Snapshot Creation and Removal | ✅ | ✅ | ❌ | ❌ | ❌ |

‎capabilities_matrix/_topics/smartstate_analysis.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
| SQLite | Linux | ✅ |
4040
| Berkeley DB (BDB) | Linux | ✅ |
4141
| Conary | Linux | ✅ |
42-
| RPM | Linux | ✅ |
42+
| RPM (RHEL 6, 7, 8, 9) | Linux | ✅ |
4343
| /etc/passwd | Linux | ✅ |
4444
| /etc/group | Linux | ✅ |
4545
| /etc/init.d | Linux | ✅ |

‎installing_on_kubernetes/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131

3232
{% include installing-vmware-vddk-containers.md %}
3333

34+
{% include installing-vmware-webmks-containers.md %}
35+
3436
# Uninstalling
3537

3638
{% include_relative _topics/uninstalling.md %}

‎installing_on_vmware_vsphere/_topics/additional_configuration.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
## Additional Configuration for Appliances on VMware vSphere
22

33
{% include installing-vmware-vddk.md %}
4+
{% include installing-vmware-webmks.md %}
45

56
### Tuning Appliance Performance
67

‎managing_infrastructure_and_inventory/_topics/vnc_and_spice_consoles.md

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -129,22 +129,7 @@ machines that will be accessed through the HTML5 or VNC console on the
129129

130130
7. Click **OK**.
131131

132-
## Configuring VMware WebMKS Support
133-
134-
Complete the following steps to enable WebMKS support in
135-
{{ site.data.product.title_short }}.
136-
137-
1. Log in to the {{ site.data.product.title_short }} user interface appliance
138-
console as the root user.
139-
140-
2. On the {{ site.data.product.title_short }} user interface appliances, create a
141-
folder titled `webmks` in the `/var/www/miq/vmdb/public/` directory.
142-
143-
/var/www/miq/vmdb/public/webmks
144-
145-
3. Download and extract the contents of [VMware WebMKS
146-
SDK](https://www.vmware.com/support/developer/html-console/) into
147-
the `webmks` folder.
132+
{% include installing-vmware-webmks.md %}
148133

149134
## Opening a Console for a Virtual Machine
150135

‎managing_providers/_topics/embedded_workflows.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ Workflows must be authored in Amazon State Languages (ASL) format. As part of au
172172
The following features of Amazon States Language are not supported by Floe:
173173
- Map State Fields:
174174
- ItemReader
175-
- ItemSelector/ItemBatcher
176175
- ResultWriter
177176

178177
2. Build the docker containers that are required for the workflow.

0 commit comments

Comments
 (0)