Merge pull request #2272 from stackhpc/fix-check-review

Fix check-review pipeline

Author: MoteHue

etc/kayobe/environments/ci-tenks/automated-deployment.sh

@@ -7,7 +7,7 @@
 
 # Script for a full deployment.
 
-set -eu
+set -eux
 
 BASE_PATH=~
 KAYOBE_BRANCH=stackhpc/2025.1
@@ -19,7 +19,9 @@ if [[ ! -f $BASE_PATH/vault-pw ]]; then
     exit 1
 fi
 
+set +x
 export KAYOBE_VAULT_PASSWORD=$(cat $BASE_PATH/vault-pw)
+set -x
 
 # Install git and tmux.
 if $(which dnf 2>/dev/null >/dev/null); then
@@ -80,6 +82,18 @@ sudo $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/configure-local-networ
 # Bootstrap the Ansible control host.
 kayobe control host bootstrap
 
+# Write interface details to Kayobe configuration. These are required for host configure.
+export ADMIN_IFACE=$(ip -4 route show default | awk '{for(i=1;i<NF;i++) if($i=="dev") {print $(i+1); exit}}')
+cat << EOF >> $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/inventory/group_vars/seed-hypervisor/network-interfaces
+admin_interface: $ADMIN_IFACE
+EOF
+
+export ADMIN_IP=$(ip -4 addr show dev "$ADMIN_IFACE" | awk '$1 == "inet" {split($2, a, "/"); print a[1]; exit}')
+cat << EOF >> $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/network-allocation.yml
+admin_ips:
+  seed-hypervisor: $ADMIN_IP
+EOF
+
 # Configure the seed hypervisor host.
 kayobe seed hypervisor host configure
 

etc/kayobe/environments/ci-tenks/networks.yml

@@ -4,6 +4,9 @@
 ###############################################################################
 # Network role to network mappings.
 
+# Network used to reach host instance
+admin_net_name: admin
+
 # Name of the network used by the seed to manage the bare metal overcloud
 # hosts via their out-of-band management controllers.
 oob_oc_net_name: mgmt
@@ -54,6 +57,10 @@ cleaning_net_name: provision_wl
 ###############################################################################
 # Network definitions.
 
+admin_cidr: 192.168.49.0/24
+admin_mtu: 1500
+admin_gateway: 192.168.49.1
+
 mgmt_cidr: 192.168.35.0/24
 mgmt_mtu: 1442
 # Native VLAN

etc/kayobe/environments/ci-tenks/seed-hypervisor.yml

@@ -5,6 +5,7 @@
 
 # List of extra networks to which seed hypervisor nodes are attached.
 seed_hypervisor_extra_network_interfaces:
+  - "{{ admin_net_name }}"
   - "{{ provision_wl_net_name }}"
   - "{{ internal_net_name }}"
   - "{{ public_net_name }}"

etc/kayobe/environments/ci-tenks/stackhpc-ci.yml

@@ -12,8 +12,8 @@ kolla_docker_namespace: stackhpc-dev
 stackhpc_release_pulp_username: "skc-ci-zuul"
 stackhpc_release_pulp_password: !vault |
   $ANSIBLE_VAULT;1.1;AES256
-  34303264313732613264353030663235386562333637313230383531636462303938333533323264
-  6138366563343635653138343162373834653636633636340a393436666664633962316663336230
-  35303362363235373137633366623332656532363635663263346436393337353530653439386632
-  3663376661376230650a653164303963303732326232623434623335623165636166663639323030
-  62373564616431316434353631666131646634373034353034646662303838386261
+  64636466626135353230356662623063636563623863316530643537333461373662633866623362
+  3339646664373231333362626666393138653130393933380a386363633831386431393963613233
+  64316630336536343631383566333164653564316264653062363438393462376139363530613733
+  3837343434666333610a663965313139653437663631636636643338356161653130613934386333
+  37363335616364393538626261366634383937373962323936663762646364653534

zuul.d/secrets.yaml

@@ -3,13 +3,13 @@
     name: tenks_vault_password
     data:
       vault_pw: !encrypted/pkcs1-oaep
-        - M3rG9U0hY71HFOu6grSbwE1NT4BflOeJ86YKLnvrQRvGqUUVO5HO3rnIYiCg0No+MgCtj
-          XWSk8+FOKcy4tfUcdxv62T8ftykaL6B0l3vWFgGWcg1GlRjn8uLTYAbvYb8ehvBNGrW3k
-          4Pp+3xssAxvn3gKPL5f57dlFymth7yiBu38U2PWYX76DqxjdUQLkjp3g5sLoz10W8F9IX
-          aKyA8hdNRFxyEWysP/vzsXMoO8ZOlESbziMkRJ5wqCeg3PNtOWanf1ryhqCfKK3SJcVPP
-          shtERIADHOqBufKGRQSOn41iicMKcFkeYtZaaadxeHMm9KYbwT4YY43MFSVBTYFPkrMLQ
-          LPRTfJtq2cHveU64wAzCpteWeqfPQvs+hsVosNVF2S/4DbSCpMPOfjWpMobPlf3rc57oj
-          Lykgi/zL+9CEj/gOv4QeYpmM5f8CvngByahiBO5FTrFXzOanOHQOuGOyQR8MQtqj+Edp3
-          bP5dzV3wpwHepeZDMPpUIhFXrp/6VVefQU5HwjJzaCiUooCAVCCV8cBsXqvNAhvNO1y41
-          cUVxFBYyCJ4JGIw1qMBPOSUnhY148xPTm9+4pD6HbR1K9NCbU7GoahFDz2jtRYjFRM401
-          YuwR7K8GRILFJ4zEbtlmwj4gMUEZSo0HE0BZPUWSZpmFs1wX5LAKenMJs0Ctpg=
+        - T3WXxHspuyZ7fIBZZ/O9KZPde2dcoIsGkI0ID6ieKr3S/DkjdknTKZRN3V0cAd+lZPTZW
+          hPlUhD7JHBkVj1kXrFI0MsMr5YYbbxxEVi7DKGYUDDlEdX7TpDrOpdaKLn7Hb2pK+3rE6
+          OF8K3rjree+iZRKdBNoPFKdIBRgyBT3wOOMiS0kb3xL17R9l/hDzLTEAywzanujQvHpaW
+          RCYvGBFKsxbKn6esxxblE2sKwysyRCNvfCQhIxhF4i0qCU7roVEexkmWmBoY561PZ9NLE
+          PCAuTm+k/TpMneQpFP3BvdWHIS2mUUbt3M0Y4G8+YXuki6YpFv7V4dOqYEZiTjaZzciPx
+          elZQC4NR6anhlnA8b2I8WA5YSPZRh3Pe56Y7FX5boBpO2GSez8+SBD6oGHLo1z7rtTAY2
+          uOxL9icmAe+Olz6T2oeTNekagvlBxhT+BcM9EF8/CRNm5Ip6lNZQmKKkjlp+gaxjmsmK0
+          8ThcH/+wq3fSuH9GpI96vLMR2syCfQB01SIJLdjDOa6v7pudVysjVLWUg24SCjZYZ75za
+          X8xTonsuPmuN95hVR/Aq71cNIKvRuS74j0Gbi6c7OrP/twkjsacCFzDUR1v9VF3+r3u4Q
+          u6t4qeoutF0oaYs4gkC6vV76Qg3sbgBsUNyHaUnjMxvZzgN+2JynqA5nB/2tfE=