Skip to content

Commit

Permalink
Merge branch 'master' into QA-add-service-catalog-retirement
Browse files Browse the repository at this point in the history
  • Loading branch information
qahmed1998 authored Dec 9, 2024
2 parents de9e0da + 4dcdca6 commit 9fd00ee
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion _data/product.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ operator_namespace: manageiq.org
workflow_service_account: manageiq-default
import_opentofu: runuser --login manageiq --command 'podman --root=/var/www/miq/vmdb/data/containers/storage image load --input /tmp/<OpenTofu_image>'
opentofu_image_name: `<OpenTofu_image>`
container_image: docker.io/manageiq/opentofu-runner:latest
container_image: docker.io/manageiq/opentofu-runner:latest
2 changes: 1 addition & 1 deletion capabilities_matrix/_topics/cloud_providers.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ The following tables outline the capabilities of {{ site.data.product.title_shor
| Instance Policy Enforcement ||||||||||
| Instance Compliance Enforcement ||||||||||
| Alerts - Real Time ||||||||||
| Integrate with Service Catalogs |||||||| ||
| Integrate with Service Catalogs |||||||| ||

| Operations | AWS | Azure | GCP | OpenStack | IBM CIC | PowerVC | PowerVS | IBM VPC | Oracle |
| ------------------------------------------------------------ | --- | ----- | --- | --------- | -------- | -------------------------------- | -------- | ------- | ------------ |
Expand Down
2 changes: 1 addition & 1 deletion capabilities_matrix/_topics/infrastructure_providers.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
| Alerts - Real Time ||||||
| Alerts - VM Value Changed ||||||
| Alerts - VM Reconfigured ||||||
| Integrate with Service Catalogs |||| | |
| Integrate with Service Catalogs |||| | |

| Operations | vSphere | oVirt / RHV | OpenStack undercloud | IBM Power HMC | KubeVirt / OSV |
| ------------------------------------------------------------ | ------- | ----------- | ----------------------- | --------------| -------- |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ Use the following command to import the OpenTofu image on your appliance server.
{{ site.data.product.import_opentofu }}
```

Where `OpenTofu_image` is the name of your OpenTofu image.
Where {{ site.data.product.opentofu_image_name }} is the name of your OpenTofu image.

You also need to set the docker image name in advanced settings before enabling the server role. Navigate to the **Settings** > **Application Settings** in {{ site.data.product.title_short }} UI and set the value for `workers/worker_base/opentofu_worker/container_image` field.

Expand Down

0 comments on commit 9fd00ee

Please sign in to comment.