Skip to content

Commit 729b075

Browse files
committed
[zero-touch-base-rhel] set default chart url, name, version. remove some images versions managed by the helm chart.
1 parent 4b503bc commit 729b075

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

ansible/configs/zero-touch-base-rhel/default_vars_openshift_cnv.yaml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -183,18 +183,15 @@ instances:
183183
# -------------------------------------------------------------------
184184
showroom_deploy_shared_cluster_enable: False
185185

186-
ocp4_workload_showroom_chart_package_url: https://agonzalezrh.github.io/showroom-deployer
187-
ocp4_workload_showroom_deployer_chart_name: showroom-single-pod
188-
ocp4_workload_showroom_deployer_chart_version: "1.3.9"
189-
ocp4_workload_showroom_zero_touch_bundle: "https://github.com/rhpds/nookbag/releases/download/nookbag-v0.0.4/nookbag-v0.0.4.zip"
186+
ocp4_workload_showroom_chart_package_url: https://rhpds.github.io/showroom-deployer
187+
ocp4_workload_showroom_deployer_chart_name: zerotouch
188+
ocp4_workload_showroom_deployer_chart_version: "^1.0.0"
190189
ocp4_workload_showroom_zero_touch_ui_enabled: "true"
191190

192191
ocp4_workload_showroom_content_only: false
193-
ocp4_workload_showroom_content_antora_playbook: zero-touch-site.yml
192+
ocp4_workload_showroom_content_antora_playbook: site.yml
194193
ocp4_workload_showroom_terminal_type: wetty
195-
ocp4_workload_showroom_wetty_image: quay.io/rhpds/wetty
196194
ocp4_workload_showroom_wetty_ssh_bastion_login: true
197-
ocp4_workload_showroom_content_image: ghcr.io/agonzalezrh/showroom-content:main
198195

199196
bastion_prefix: "{{ groups['bastions'][0] | regex_replace('\\..*$') }}"
200197

ansible/roles_ocp_workloads/ocp4_workload_showroom/defaults/main.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ ocp4_workload_showroom_terminal_requests_memory: 256Mi
4848
ocp4_workload_showroom_terminal_limits_cpu: 500m
4949
ocp4_workload_showroom_terminal_limits_memory: 1Gi
5050

51-
ocp4_workload_showroom_content_image: ghcr.io/agonzalezrh/showroom-content:latest
51+
ocp4_workload_showroom_content_image: quay.io/rhpds/showroom-content:v1.3.0
5252

5353
# Showroom Terminal Image. Options include:
5454
# - quay.io/rhpds/openshift-showroom-terminal-ocp:latest
@@ -103,7 +103,7 @@ ocp4_workload_showroom_test_self_provisioner: false
103103
ocp4_workload_showroom_zero_touch_bundle: ""
104104
ocp4_workload_showroom_zero_touch_ui_enabled: false
105105

106-
ocp4_workload_showroom_cloud_image: quay.io/agonzalezrh/showroom-cloud:v0.0.12
106+
ocp4_workload_showroom_cloud_image: quay.io/rhpds/showroom-cloud:v1.1.3
107107

108108
ocp4_workload_showroom_ironrdp_enable: false
109109
ocp4_workload_showroom_ironrdp_image: quay.io/agonzalezrh/ironrdp:v0.0.2

0 commit comments

Comments
 (0)