use the new network and new capi image

nesi · Mar 4, 2024 · 656b2aa · 656b2aa
1 parent e0826df
commit 656b2aa
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/roles/capi-cluster/workload/defaults/main.yml b/roles/capi-cluster/workload/defaults/main.yml
@@ -2,7 +2,7 @@
 k8s_ood_enable: false
 
 kubernetes_version: v1.28.5
-capi_image_name: rocky-93-kube-v1.28.5-rdc-ca
+capi_image_name: rocky-93-kube-v1.28.5
 
 capi_provider_version: v0.8.0
 

diff --git a/roles/capi-cluster/workload/templates/openstack-cluster-config.yml.j2 b/roles/capi-cluster/workload/templates/openstack-cluster-config.yml.j2
@@ -5,7 +5,7 @@ OPENSTACK_CLOUD_CACERT_B64: {{ base64_ca_cert.stdout }}
 KUBERNETES_VERSION: "{{ kubernetes_version }}"
 OPENSTACK_CONTROL_PLANE_MACHINE_FLAVOR: "{{ control_plane_flavor }}"
 OPENSTACK_DNS_NAMESERVERS: 130.216.1.1
-OPENSTACK_EXTERNAL_NETWORK_ID: 33d0c11b-b659-4b77-9afc-5676fe965839
+OPENSTACK_EXTERNAL_NETWORK_ID: 3f405cc9-28a3-4973-b5a1-7f50f112e5d5
 OPENSTACK_FAILURE_DOMAIN: nova
 OPENSTACK_IMAGE_NAME: "{{ capi_image_name }}"
 OPENSTACK_NODE_MACHINE_FLAVOR: "{{ worker_flavour }}"

diff --git a/roles/openondemand-k8s/web-node/defaults/main.yml b/roles/openondemand-k8s/web-node/defaults/main.yml
@@ -18,6 +18,8 @@ ood_hooks_dir: "/opt/ood-hooks"
 ood_k8s_hooks_dir: "{{ ood_hooks_dir }}/k8s-bootstrap"
 ood_k8s_yaml_dir: "{{ ood_k8s_hooks_dir }}/yaml"
 
+use_job_pod_reaper: false
+
 network_policy_allow_cidr: 0.0.0.0/0
 k8s_namespace_prefix: "user-"
 

diff --git a/vars/ondemand-config.yml.example b/vars/ondemand-config.yml.example
@@ -106,7 +106,7 @@ enable_gpu_nodes: false
 use_job_pod_reaper: false
 
 kubernetes_version: v1.28.5
-capi_image_name: rocky-93-kube-v1.28.5-rdc-ca
+capi_image_name: rocky-93-kube-v1.28.5
 
 capi_provider_version: v0.8.0