Skip to content

Commit

Permalink
Updates 5gran to OCP 4.17 (#8795)
Browse files Browse the repository at this point in the history
Signed-off-by: Mario Vazquez <mavazque@redhat.com>
  • Loading branch information
mvazquezc authored Nov 12, 2024
1 parent c3a5bda commit 9eeb2c6
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ become_override: true
ocp_username: opentlc-mgr
silent: false

lab_version: "lab-4.16"
lab_version: "lab-4.17"
lab_release: "4.17"
repo_user: "RHsyseng"
# yamllint disable rule:line-length
kcli_rpm: "https://github.com/{{ repo_user }}/5g-ran-deployments-on-ocp-lab/raw/{{ lab_version }}/lab-materials/kcli-rpm/kcli-99.0.0.git.202409091407.2293cfe-0.el9.x86_64.rpm"
kcli_rpm: "https://github.com/{{ repo_user }}/5g-ran-deployments-on-ocp-lab/releases/download/{{ lab_release }}/kcli-99.0.0.git.202411061013.2f63d4b-0.el9.x86_64.rpm"
# yamllint enable rule:line-length
ocp4_major_release: "4.16"
ocp4_major_release: "4.17"
lab_network_cidr: "192.168.125.0/24"
lab_network_domain: "5g-deployment.lab"
lab_sriov_domain: "sriov-network.lab"
Expand All @@ -24,14 +25,14 @@ lab_sno_vm_memory: 24000
lab_sno_vm_disk: 200
extra_disk_libvirt_images: true
# yamllint disable rule:line-length
rhcos_live_image: 'rhcos-4.16.0-x86_64-live.x86_64.iso'
rhcos_rootfs_image: 'rhcos-4.16.0-x86_64-live-rootfs.x86_64.img'
rhcos_live_image_url: "https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.16/4.16.0/{{ rhcos_live_image }}"
rhcos_rootfs_image_url: "https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.16/4.16.0/{{ rhcos_rootfs_image }}"
rhcos_live_image: 'rhcos-4.17.0-x86_64-live.x86_64.iso'
rhcos_rootfs_image: 'rhcos-4.17.0-x86_64-live-rootfs.x86_64.img'
rhcos_live_image_url: "https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.17/4.17.0/{{ rhcos_live_image }}"
rhcos_rootfs_image_url: "https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.17/4.17.0/{{ rhcos_rootfs_image }}"
lab_url: "https://labs.sysdeseng.com/5g-ran-deployments-on-ocp-lab/{{ ocp4_major_release }}/index.html"
# yamllint enable rule:line-length
aap2_webconsole_user: "admin"
aap2_automationactrl_url: "https://automation-aap.apps.hub.5g-deployment.lab"
# yamllint disable rule:line-length
etc_hosts_records: "infra.5g-deployment.lab api.hub.5g-deployment.lab multicloud-console.apps.hub.5g-deployment.lab console-openshift-console.apps.hub.5g-deployment.lab oauth-openshift.apps.hub.5g-deployment.lab openshift-gitops-server-openshift-gitops.apps.hub.5g-deployment.lab assisted-service-multicluster-engine.apps.hub.5g-deployment.lab automation-hub-aap.apps.hub.5g-deployment.lab automation-aap.apps.hub.5g-deployment.lab api.sno1.5g-deployment.lab api.sno2.5g-deployment.lab"
# yamllint enable rule:line-length
# yamllint enable rule:line-length
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

- name: Ensure hub cluster is deployed via kcli
ansible.builtin.shell:
cmd: kcli create cluster openshift --pf hub.yml -P force=true
cmd: kcli create cluster openshift --pf hub.yml -P force=true &> /root/kcli-hub-deploy.log
args:
chdir: /root/
async: 3600
Expand Down Expand Up @@ -38,6 +38,7 @@

- name: Remove kubeadmin user
kubernetes.core.k8s:
kubeconfig: /root/hub-kubeconfig
state: absent
api_version: v1
kind: Secret
Expand Down Expand Up @@ -102,7 +103,7 @@
namespace: openshift-storage
register: lvmcluster
retries: 60
delay: 10
delay: 60
until:
- lvmcluster is defined
- lvmcluster.resources | length > 0
Expand Down

0 comments on commit 9eeb2c6

Please sign in to comment.