[5e2c19b00b1a3d88] Fix BaremetalHostInventory spec in 2.29 templates

Andrey Bubyr
Mirantis · Jan 20, 2025 · 7fe30a3 · 7fe30a3
1 parent ef01795
commit 7fe30a3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/deploy.sh b/deploy.sh
@@ -987,7 +987,7 @@ function prepare_managed_cluster_templates {
     ${scp_bin} -i "${SSH_PRIVATE_KEY_PATH}" -r "${managed_templates_local_dir}/certs" "${SEED_NODE_USER}@${NETWORK_LCM_SEED_IP}:${managed_templates_remote_dir}/certs"
     ${ssh_cmd} chmod +x "${managed_templates_remote_dir}/certs/create_secrets.sh"
 
-    cp -r "${managed_templates_local_dir}/hack" "${managed_templates_work_dir}/hack"
+    cp -Lr "${managed_templates_local_dir}/hack" "${managed_templates_work_dir}/hack"
 }
 
 function setup_seed {

diff --git a/templates/2.29.0/managed/baremetalhosts.yaml.template b/templates/2.29.0/managed/baremetalhosts.yaml.template
@@ -85,7 +85,7 @@ spec:
   bootMACAddress: "{{ managed_control_mac_address_0 }}"
   bmc:
     address: 127.0.0.1:6240
-    credentialsName: "managed-control-0-bmc-credentials"
+    bmhCredentialsName: "managed-control-0-bmc-credentials"
 ---
 apiVersion: kaas.mirantis.com/v1alpha1
 kind: BareMetalHostInventory
@@ -101,7 +101,7 @@ spec:
   bootMACAddress: "{{ managed_control_mac_address_1 }}"
   bmc:
     address: 127.0.0.1:6241
-    credentialsName: "managed-control-1-bmc-credentials"
+    bmhCredentialsName: "managed-control-1-bmc-credentials"
 ---
 apiVersion: kaas.mirantis.com/v1alpha1
 kind: BareMetalHostInventory
@@ -117,7 +117,7 @@ spec:
   bootMACAddress: "{{ managed_control_mac_address_2 }}"
   bmc:
     address: 127.0.0.1:6242
-    credentialsName: "managed-control-2-bmc-credentials"
+    bmhCredentialsName: "managed-control-2-bmc-credentials"
 ---
 apiVersion: kaas.mirantis.com/v1alpha1
 kind: BareMetalHostInventory
@@ -133,7 +133,7 @@ spec:
   bootMACAddress: "{{ managed_worker_mac_address_0 }}"
   bmc:
     address: 127.0.0.1:6250
-    credentialsName: "managed-worker-0-bmc-credentials"
+    bmhCredentialsName: "managed-worker-0-bmc-credentials"
 ---
 apiVersion: kaas.mirantis.com/v1alpha1
 kind: BareMetalHostInventory
@@ -149,7 +149,7 @@ spec:
   bootMACAddress: "{{ managed_worker_mac_address_1 }}"
   bmc:
     address: 127.0.0.1:6251
-    credentialsName: "managed-worker-1-bmc-credentials"
+    bmhCredentialsName: "managed-worker-1-bmc-credentials"
 ---
 apiVersion: kaas.mirantis.com/v1alpha1
 kind: BareMetalHostInventory
@@ -165,4 +165,4 @@ spec:
   bootMACAddress: "{{ managed_worker_mac_address_2 }}"
   bmc:
     address: 127.0.0.1:6252
-    credentialsName: managed-worker-2-bmc-credentials
+    bmhCredentialsName: managed-worker-2-bmc-credentials
diff --git a/templates/2.29.0/management/baremetalhosts.yaml.template b/templates/2.29.0/management/baremetalhosts.yaml.template
@@ -48,7 +48,7 @@ spec:
   bootMACAddress: "{{ mgmt_node_mac_address_0 }}"
   bmc:
     address: 127.0.0.1:6230
-    credentialsName: "master-0-bmc-credentials"
+    bmhCredentialsName: "master-0-bmc-credentials"
 ---
 apiVersion: kaas.mirantis.com/v1alpha1
 kind: BareMetalHostInventory
@@ -63,7 +63,7 @@ spec:
   bootMACAddress: "{{ mgmt_node_mac_address_1 }}"
   bmc:
     address: 127.0.0.1:6231
-    credentialsName: "master-1-bmc-credentials"
+    bmhCredentialsName: "master-1-bmc-credentials"
 ---
 apiVersion: kaas.mirantis.com/v1alpha1
 kind: BareMetalHostInventory
@@ -78,4 +78,4 @@ spec:
   bootMACAddress: "{{ mgmt_node_mac_address_2 }}"
   bmc:
     address: 127.0.0.1:6232
-    credentialsName: "master-2-bmc-credentials"
+    bmhCredentialsName: "master-2-bmc-credentials"