Skip to content

Commit 1289a24

Browse files
committed
Add populator_vsphere_xcopy_volume_image_fqin to the operator
Issues: 1. The xcopy volume populator is missing on the populator-controller 2. When user wants to customize the volume populator Fix: Add new argument to the operator `populator_vsphere_xcopy_volume_image_fqin` and pass it to the populator controller as `VSPHERE_XCOPY_VOLUME_POPULATOR_IMAGE` env. Signed-off-by: Martin Necas <[email protected]>
1 parent ac813a4 commit 1289a24

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

operator/roles/forkliftcontroller/defaults/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ populator_ovirt_image_fqin: "{{ lookup( 'env', 'OVIRT_POPULATOR_IMAGE') or looku
110110
populator_controller_deployment_name: "{{ app_name }}-volume-populator-controller"
111111
populator_controller_container_name: "{{ app_name }}-populator-controller"
112112
populator_openstack_image_fqin: "{{ lookup( 'env', 'OPENSTACK_POPULATOR_IMAGE') or lookup( 'env', 'RELATED_IMAGE_OPENSTACK_POPULATOR') }}"
113+
populator_vsphere_xcopy_volume_image_fqin: "{{ lookup( 'env', 'VSPHERE_XCOPY_VOLUME_POPULATOR_IMAGE') or lookup( 'env', 'RELATED_IMAGE_VSPHERE_XCOPY_VOLUME_POPULATOR') }}"
113114

114115
must_gather_image_fqin: "{{ lookup( 'env', 'MUST_GATHER_IMAGE') or lookup( 'env', 'RELATED_IMAGE_MUST_GATHER') }}"
115116

operator/roles/forkliftcontroller/templates/populator/deployment-populator-controller.yml.j2

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ spec:
2828
value: {{ populator_ovirt_image_fqin }}
2929
- name: OPENSTACK_POPULATOR_IMAGE
3030
value: {{ populator_openstack_image_fqin }}
31+
{% if feature_copy_offload|bool %}
32+
- name: VSPHERE_XCOPY_VOLUME_POPULATOR_IMAGE
33+
value: {{ populator_vsphere_xcopy_volume_image_fqin }}
34+
{% endif %}
3135
ports:
3236
- containerPort: 8080
3337
name: http-endpoint

0 commit comments

Comments
 (0)