diff --git a/manifests/function/baremetal-operator/config-file/inspector.ipxe b/manifests/function/baremetal-operator/config-file/inspector.ipxe index ac534a07c..16f7512be 100644 --- a/manifests/function/baremetal-operator/config-file/inspector.ipxe +++ b/manifests/function/baremetal-operator/config-file/inspector.ipxe @@ -4,6 +4,6 @@ echo In inspector.ipxe imgfree # NOTE(dtantsur): keep inspection kernel params in [mdns]params in ironic-inspector-image -kernel --timeout 60000 http://$(PROVISIONING_IP):80/images/ironic-python-agent.kernel ipa-inspection-callback-url=http://$(PROVISIONING_IP):5050/v1/continue ipa-inspection-collectors=default,extra-hardware,logs systemd.journald.forward_to_console=yes BOOTIF=${mac} ipa-debug=1 ipa-inspection-dhcp-all-interfaces=1 ipa-collect-lldp=1 initrd=ironic-python-agent.initramfs || goto retry_boot -initrd --timeout 60000 http://$(PROVISIONING_IP):80/images/ironic-python-agent.initramfs || goto retry_boot +kernel --timeout 60000 http://$(PROVISIONING_IP):80/images/tinyipa-stable-ussuri.vmlinuz ipa-inspection-callback-url=http://$(PROVISIONING_IP):5050/v1/continue ipa-inspection-collectors=default,extra-hardware,logs systemd.journald.forward_to_console=yes BOOTIF=${mac} ipa-debug=1 ipa-inspection-dhcp-all-interfaces=1 ipa-collect-lldp=1 initrd=tinyipa-stable-ussuri.gz || goto retry_boot +initrd --timeout 60000 http://$(PROVISIONING_IP):80/images/tinyipa-stable-ussuri.gz || goto retry_boot boot diff --git a/manifests/function/baremetal-operator/entrypoint/init-bootstrap b/manifests/function/baremetal-operator/entrypoint/init-bootstrap index becd4af54..a2cc0fd0b 100644 --- a/manifests/function/baremetal-operator/entrypoint/init-bootstrap +++ b/manifests/function/baremetal-operator/entrypoint/init-bootstrap @@ -7,7 +7,7 @@ rm -f /shared/sed_commands for var_name in $( ls ) ; do echo -n s!\$\($var_name\)! >> /shared/sed_commands cat $var_name >> /shared/sed_commands - echo ! >> /shared/sed_commands + echo !g >> /shared/sed_commands export $var_name=$(cat $var_name) done popd diff --git a/manifests/function/k8scontrol/controlplane.yaml b/manifests/function/k8scontrol/controlplane.yaml index 49278ba86..42620d812 100644 --- a/manifests/function/k8scontrol/controlplane.yaml +++ b/manifests/function/k8scontrol/controlplane.yaml @@ -11,6 +11,8 @@ spec: name: cluster-controlplane kubeadmConfigSpec: preKubeadmCommands: + - echo 'root:r00tme' | chpasswd + - echo 'ubuntu:r00tme' | chpasswd - | cat <