diff --git a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/namespace.yaml.j2 b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/namespace.yaml.j2 index cea09001bcc..5de0ae9c94a 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/namespace.yaml.j2 +++ b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/namespace.yaml.j2 @@ -3,5 +3,5 @@ apiVersion: v1 kind: Namespace metadata: - name: {{ ocp4_workload_virt_roadshow_vms_base_namespace }}{{ ocp4_workload_virt_roadshow_vms_userbase }}{{ user_number }} + name: {{ (ocp4_workload_virt_roadshow_vms_base_namespace ~ ocp4_workload_virt_roadshow_vms_userbase ~ user_number) | to_json }} {% endfor %} diff --git a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/rolebinding.yaml.j2 b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/rolebinding.yaml.j2 index 6ac88dce2d3..7140a4bf8b1 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/rolebinding.yaml.j2 +++ b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/rolebinding.yaml.j2 @@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: admin - namespace: {{ ocp4_workload_virt_roadshow_vms_base_namespace }}{{ ocp4_workload_virt_roadshow_vms_userbase }}{{ user_number }} + namespace: {{ (ocp4_workload_virt_roadshow_vms_base_namespace ~ ocp4_workload_virt_roadshow_vms_userbase ~ user_number) | to_json }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -12,5 +12,5 @@ roleRef: subjects: - apiGroup: rbac.authorization.k8s.io kind: User - name: {{ ocp4_workload_virt_roadshow_vms_userbase }}{{ user_number }} + name: {{ (ocp4_workload_virt_roadshow_vms_userbase ~ user_number) | to_json }} {% endfor %} diff --git a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/route_webapp.yaml.j2 b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/route_webapp.yaml.j2 index cb00309b03b..1573b497739 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/route_webapp.yaml.j2 +++ b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/route_webapp.yaml.j2 @@ -4,7 +4,7 @@ apiVersion: route.openshift.io/v1 kind: Route metadata: name: route-webapp - namespace: {{ ocp4_workload_virt_roadshow_vms_base_namespace }}{{ ocp4_workload_virt_roadshow_vms_userbase }}{{ user_number }} + namespace: {{ (ocp4_workload_virt_roadshow_vms_base_namespace ~ ocp4_workload_virt_roadshow_vms_userbase ~ user_number) | to_json }} spec: to: kind: Service diff --git a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/service_database.yaml.j2 b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/service_database.yaml.j2 index 51b8c68a769..df988632043 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/service_database.yaml.j2 +++ b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/service_database.yaml.j2 @@ -5,7 +5,7 @@ apiVersion: v1 kind: Service metadata: name: database - namespace: {{ ocp4_workload_virt_roadshow_vms_base_namespace }}{{ ocp4_workload_virt_roadshow_vms_userbase }}{{ user_number }} + namespace: {{ (ocp4_workload_virt_roadshow_vms_base_namespace ~ ocp4_workload_virt_roadshow_vms_userbase ~ user_number) | to_json }} spec: selector: vm.kubevirt.io/name: database diff --git a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/service_webapp.yaml.j2 b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/service_webapp.yaml.j2 index f3dd401ed6a..f5b4b033b0a 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/service_webapp.yaml.j2 +++ b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/service_webapp.yaml.j2 @@ -4,7 +4,7 @@ apiVersion: v1 kind: Service metadata: name: webapp - namespace: {{ ocp4_workload_virt_roadshow_vms_base_namespace }}{{ ocp4_workload_virt_roadshow_vms_userbase }}{{ user_number }} + namespace: {{ (ocp4_workload_virt_roadshow_vms_base_namespace ~ ocp4_workload_virt_roadshow_vms_userbase ~ user_number) | to_json }} spec: selector: env: webapp diff --git a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/vm_database.yaml.j2 b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/vm_database.yaml.j2 index 9cd1bd75b09..e73790e90b8 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/vm_database.yaml.j2 +++ b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/vm_database.yaml.j2 @@ -9,7 +9,7 @@ metadata: app: database app.kubernetes.io/part-of: 3-Tier-App name: database - namespace: {{ ocp4_workload_virt_roadshow_vms_base_namespace }}{{ ocp4_workload_virt_roadshow_vms_userbase }}{{ user_number }} + namespace: {{ (ocp4_workload_virt_roadshow_vms_base_namespace ~ ocp4_workload_virt_roadshow_vms_userbase ~ user_number) | to_json }} spec: dataVolumeTemplates: - apiVersion: cdi.kubevirt.io/v1beta1 @@ -19,12 +19,12 @@ spec: spec: source: http: - url: {{ ocp4_workload_virt_roadshow_vms_image_url }}/database.qcow2 + url: {{ (ocp4_workload_virt_roadshow_vms_image_url ~ '/database.qcow2') | to_json }} storage: resources: requests: storage: 16Gi - running: {{ ocp4_workload_virt_roadshow_vms_start_vms | bool }} + running: {{ ocp4_workload_virt_roadshow_vms_start_vms | bool | to_json }} template: metadata: annotations: @@ -36,8 +36,7 @@ spec: kubevirt.io/size: small spec: {% if ocp4_workload_virt_roadshow_vms_node_selector_enabled | bool %} - nodeSelector: - {{ ocp4_workload_virt_roadshow_vms_node_selector }} + nodeSelector: {{ ocp4_workload_virt_roadshow_vms_node_selector | to_json }} {% endif %} domain: cpu: @@ -62,7 +61,7 @@ spec: bootloader: bios: {} machine: - type: {{ ocp4_workload_virt_roadshow_vms_machine_type }} + type: {{ ocp4_workload_virt_roadshow_vms_machine_type | to_json }} resources: requests: memory: 2Gi diff --git a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/vm_winweb01.yaml.j2 b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/vm_winweb01.yaml.j2 index 69cfa71ae69..b1eb14a99b7 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/vm_winweb01.yaml.j2 +++ b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/vm_winweb01.yaml.j2 @@ -9,7 +9,7 @@ metadata: vm.kubevirt.io/template.revision: '1' vm.kubevirt.io/template.version: v0.25.0 name: winweb01 - namespace: {{ ocp4_workload_virt_roadshow_vms_base_namespace }}{{ ocp4_workload_virt_roadshow_vms_userbase }}{{ user_number }} + namespace: {{ (ocp4_workload_virt_roadshow_vms_base_namespace ~ ocp4_workload_virt_roadshow_vms_userbase ~ user_number) | to_json }} spec: dataVolumeTemplates: - apiVersion: cdi.kubevirt.io/v1beta1 @@ -19,12 +19,12 @@ spec: spec: source: http: - url: {{ ocp4_workload_virt_roadshow_vms_image_url }}/winweb01.qcow2 + url: {{ (ocp4_workload_virt_roadshow_vms_image_url ~ '/winweb01.qcow2') | to_json }} storage: resources: requests: storage: 90Gi - running: {{ ocp4_workload_virt_roadshow_vms_start_vms | bool }} + running: {{ ocp4_workload_virt_roadshow_vms_start_vms | bool | to_json }} template: {% if not ocp4_workload_virt_roadshow_vms_roadshow_setup | bool %} metadata: @@ -33,8 +33,7 @@ spec: {% endif %} spec: {% if ocp4_workload_virt_roadshow_vms_node_selector_enabled | bool %} - nodeSelector: - {{ ocp4_workload_virt_roadshow_vms_node_selector }} + nodeSelector: {{ ocp4_workload_virt_roadshow_vms_node_selector | to_json }} {% endif %} domain: clock: @@ -87,7 +86,7 @@ spec: bootloader: efi: {} machine: - type: {{ ocp4_workload_virt_roadshow_vms_machine_type }} + type: {{ ocp4_workload_virt_roadshow_vms_machine_type | to_json }} resources: requests: memory: 6Gi diff --git a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/vm_winweb02.yaml.j2 b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/vm_winweb02.yaml.j2 index 0817da783e6..ed5199eab39 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/vm_winweb02.yaml.j2 +++ b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/vm_winweb02.yaml.j2 @@ -9,7 +9,7 @@ metadata: vm.kubevirt.io/template.revision: '1' vm.kubevirt.io/template.version: v0.25.0 name: winweb02 - namespace: {{ ocp4_workload_virt_roadshow_vms_base_namespace }}{{ ocp4_workload_virt_roadshow_vms_userbase }}{{ user_number }} + namespace: {{ (ocp4_workload_virt_roadshow_vms_base_namespace ~ ocp4_workload_virt_roadshow_vms_userbase ~ user_number) | to_json }} spec: dataVolumeTemplates: - apiVersion: cdi.kubevirt.io/v1beta1 @@ -19,12 +19,12 @@ spec: spec: source: http: - url: {{ ocp4_workload_virt_roadshow_vms_image_url }}/winweb02.qcow2 + url: {{ (ocp4_workload_virt_roadshow_vms_image_url ~ '/winweb02.qcow2') | to_json }} storage: resources: requests: storage: 90Gi - running: {{ ocp4_workload_virt_roadshow_vms_start_vms | bool }} + running: {{ ocp4_workload_virt_roadshow_vms_start_vms | bool | to_json }} template: {% if not ocp4_workload_virt_roadshow_vms_roadshow_setup | bool %} metadata: @@ -33,8 +33,7 @@ spec: {% endif %} spec: {% if ocp4_workload_virt_roadshow_vms_node_selector_enabled | bool %} - nodeSelector: - {{ ocp4_workload_virt_roadshow_vms_node_selector }} + nodeSelector: {{ ocp4_workload_virt_roadshow_vms_node_selector | to_json }} {% endif %} domain: clock: @@ -87,7 +86,7 @@ spec: bootloader: efi: {} machine: - type: {{ ocp4_workload_virt_roadshow_vms_machine_type }} + type: {{ ocp4_workload_virt_roadshow_vms_machine_type | to_json }} resources: requests: memory: 6Gi diff --git a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/namespace.yaml.j2 b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/namespace.yaml.j2 index 968297b8fcd..4e7cb1bb4a0 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/namespace.yaml.j2 +++ b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/namespace.yaml.j2 @@ -2,4 +2,4 @@ apiVersion: v1 kind: Namespace metadata: - name: {{ ocp4_workload_virt_roadshow_vms_namespace }} + name: {{ ocp4_workload_virt_roadshow_vms_namespace | to_json }} diff --git a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/route_webapp.yaml.j2 b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/route_webapp.yaml.j2 index 1b6c3f365f9..907e6dcd023 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/route_webapp.yaml.j2 +++ b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/route_webapp.yaml.j2 @@ -3,7 +3,7 @@ apiVersion: route.openshift.io/v1 kind: Route metadata: name: route-webapp - namespace: {{ ocp4_workload_virt_roadshow_vms_namespace }} + namespace: {{ ocp4_workload_virt_roadshow_vms_namespace | to_json }} spec: to: kind: Service diff --git a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/service_database.yaml.j2 b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/service_database.yaml.j2 index d546b4494bc..fd45b92dc4f 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/service_database.yaml.j2 +++ b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/service_database.yaml.j2 @@ -4,7 +4,7 @@ apiVersion: v1 kind: Service metadata: name: database - namespace: {{ ocp4_workload_virt_roadshow_vms_namespace }} + namespace: {{ ocp4_workload_virt_roadshow_vms_namespace | to_json }} spec: selector: vm.kubevirt.io/name: database diff --git a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/service_webapp.yaml.j2 b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/service_webapp.yaml.j2 index 6864755f8a8..bdbbb212405 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/service_webapp.yaml.j2 +++ b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/service_webapp.yaml.j2 @@ -3,7 +3,7 @@ apiVersion: v1 kind: Service metadata: name: webapp - namespace: {{ ocp4_workload_virt_roadshow_vms_namespace }} + namespace: {{ ocp4_workload_virt_roadshow_vms_namespace | to_json }} spec: selector: env: webapp diff --git a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/vm_database.yaml.j2 b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/vm_database.yaml.j2 index f2dc7e9ce07..392007bcb76 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/vm_database.yaml.j2 +++ b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/vm_database.yaml.j2 @@ -8,7 +8,7 @@ metadata: app: database app.kubernetes.io/part-of: 3-Tier-App name: database - namespace: {{ ocp4_workload_virt_roadshow_vms_namespace }} + namespace: {{ ocp4_workload_virt_roadshow_vms_namespace | to_json }} spec: dataVolumeTemplates: - apiVersion: cdi.kubevirt.io/v1beta1 @@ -18,12 +18,12 @@ spec: spec: source: http: - url: {{ ocp4_workload_virt_roadshow_vms_image_url }}/database.qcow2 + url: {{ (ocp4_workload_virt_roadshow_vms_image_url ~ /database.qcow2) | to_json }} storage: resources: requests: storage: 16Gi - running: {{ ocp4_workload_virt_roadshow_vms_start_vms | bool }} + running: {{ ocp4_workload_virt_roadshow_vms_start_vms | bool | to_json }} template: metadata: annotations: @@ -35,8 +35,7 @@ spec: kubevirt.io/size: small spec: {% if ocp4_workload_virt_roadshow_vms_node_selector_enabled | bool %} - nodeSelector: - {{ ocp4_workload_virt_roadshow_vms_node_selector }} + nodeSelector: {{ ocp4_workload_virt_roadshow_vms_node_selector | to_json }} {% endif %} domain: cpu: @@ -61,7 +60,7 @@ spec: bootloader: bios: {} machine: - type: {{ ocp4_workload_virt_roadshow_vms_machine_type }} + type: {{ ocp4_workload_virt_roadshow_vms_machine_type | to_json }} resources: requests: memory: 2Gi diff --git a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/vm_winweb01.yaml.j2 b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/vm_winweb01.yaml.j2 index aed08876b07..06857783042 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/vm_winweb01.yaml.j2 +++ b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/vm_winweb01.yaml.j2 @@ -8,7 +8,7 @@ metadata: vm.kubevirt.io/template.revision: '1' vm.kubevirt.io/template.version: v0.25.0 name: winweb01 - namespace: {{ ocp4_workload_virt_roadshow_vms_namespace }} + namespace: {{ ocp4_workload_virt_roadshow_vms_namespace | to_json }} spec: dataVolumeTemplates: - apiVersion: cdi.kubevirt.io/v1beta1 @@ -18,12 +18,12 @@ spec: spec: source: http: - url: {{ ocp4_workload_virt_roadshow_vms_image_url }}/winweb01.qcow2 + url: {{ (ocp4_workload_virt_roadshow_vms_image_url ~ '/winweb01.qcow2') | to_json }} storage: resources: requests: storage: 90Gi - running: {{ ocp4_workload_virt_roadshow_vms_start_vms | bool }} + running: {{ ocp4_workload_virt_roadshow_vms_start_vms | bool | to_json }} template: {% if not ocp4_workload_virt_roadshow_vms_roadshow_setup | bool %} metadata: @@ -32,8 +32,7 @@ spec: {% endif %} spec: {% if ocp4_workload_virt_roadshow_vms_node_selector_enabled | bool %} - nodeSelector: - {{ ocp4_workload_virt_roadshow_vms_node_selector }} + nodeSelector: {{ ocp4_workload_virt_roadshow_vms_node_selector | to_json }} {% endif %} domain: clock: @@ -86,7 +85,7 @@ spec: bootloader: efi: {} machine: - type: {{ ocp4_workload_virt_roadshow_vms_machine_type }} + type: {{ ocp4_workload_virt_roadshow_vms_machine_type | to_json }} resources: requests: memory: 6Gi diff --git a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/vm_winweb02.yaml.j2 b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/vm_winweb02.yaml.j2 index 86e0f5017a5..cb225d0a793 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/vm_winweb02.yaml.j2 +++ b/ansible/roles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/vm_winweb02.yaml.j2 @@ -8,7 +8,7 @@ metadata: vm.kubevirt.io/template.revision: '1' vm.kubevirt.io/template.version: v0.25.0 name: winweb02 - namespace: {{ ocp4_workload_virt_roadshow_vms_namespace }} + namespace: {{ ocp4_workload_virt_roadshow_vms_namespace | to_json }} spec: dataVolumeTemplates: - apiVersion: cdi.kubevirt.io/v1beta1 @@ -18,12 +18,12 @@ spec: spec: source: http: - url: {{ ocp4_workload_virt_roadshow_vms_image_url }}/winweb02.qcow2 + url: {{ (ocp4_workload_virt_roadshow_vms_image_url ~ '/winweb02.qcow2') | to_json }} storage: resources: requests: storage: 90Gi - running: {{ ocp4_workload_virt_roadshow_vms_start_vms | bool }} + running: {{ ocp4_workload_virt_roadshow_vms_start_vms | bool | to_json }} template: {% if not ocp4_workload_virt_roadshow_vms_roadshow_setup | bool %} metadata: @@ -32,8 +32,7 @@ spec: {% endif %} spec: {% if ocp4_workload_virt_roadshow_vms_node_selector_enabled | bool %} - nodeSelector: - {{ ocp4_workload_virt_roadshow_vms_node_selector }} + nodeSelector: {{ ocp4_workload_virt_roadshow_vms_node_selector | to_json }} {% endif %} domain: clock: @@ -86,7 +85,7 @@ spec: bootloader: efi: {} machine: - type: {{ ocp4_workload_virt_roadshow_vms_machine_type }} + type: {{ ocp4_workload_virt_roadshow_vms_machine_type | to_json }} resources: requests: memory: 6Gi