diff --git a/lib/kadeploy3/server/config.rb b/lib/kadeploy3/server/config.rb index 433750d36e519a8887bc1f97fdee3c38e7f6b2dd..0f6d3927dc304162e0e5d4fba8ce477487caed17 100644 --- a/lib/kadeploy3/server/config.rb +++ b/lib/kadeploy3/server/config.rb @@ -48,6 +48,7 @@ module Configuration end end + class Config VERSION_FILE = File.join($kadeploy_confdir, "version") @@ -252,7 +253,7 @@ module Configuration configfile = self.class.file begin begin - config = YAML.load_file(configfile) + config = YAML.load_file(configfile,aliases:true) rescue Errno::ENOENT raise ArgumentError.new("File not found '#{configfile}'") rescue StandartdError @@ -748,7 +749,7 @@ module Configuration configfile = self.class.file begin begin - config = YAML.load_file(configfile) + config = YAML.load_file(configfile,aliases:true) rescue Errno::ENOENT raise ArgumentError.new("File not found '#{configfile}'") rescue StandardError @@ -942,7 +943,7 @@ module Configuration def load(cluster, configfile) begin begin - config = YAML.load_file(configfile) + config = YAML.load_file(configfile,aliases:true) rescue Errno::ENOENT raise ArgumentError.new( "Cluster configuration file not found '#{configfile}'" @@ -1372,7 +1373,7 @@ module Configuration def load(common) configfile = self.class.file begin - config = YAML.load_file(configfile) + config = YAML.load_file(configfile,aliases:true) rescue Errno::ENOENT return true rescue StandardError diff --git a/vagrant-env/scripts/install-grub2-dev.sh b/vagrant-env/scripts/install-grub2-dev.sh index 7b3f0a297ef8076783e6d2de21abe794ffd7c0fc..1f027c40f8d5e86c6ec50c40d29722e510dc7b4c 100644 --- a/vagrant-env/scripts/install-grub2-dev.sh +++ b/vagrant-env/scripts/install-grub2-dev.sh @@ -392,10 +392,11 @@ fi -if chroot ${KADEPLOY_ENV_EXTRACTION_DIR} /bin/ssh-keygen -A; then +if chroot ${KADEPLOY_ENV_EXTRACTION_DIR} /bin/ssh-keygen -A; then echo "it just works" fi + ### ## End ## diff --git a/vagrant-env/scripts/kexec.sh b/vagrant-env/scripts/kexec.sh index 2cbf580be3f9193aa38113527463829a833835e4..71bcc5fef604c0c11c8880304f839980d6f31b10 100644 --- a/vagrant-env/scripts/kexec.sh +++ b/vagrant-env/scripts/kexec.sh @@ -5,8 +5,8 @@ if [ $KADEPLOY_KEXEC_KIND = "to_deployed_env" ]; then initrd=${KADEPLOY_ENV_EXTRACTION_DIR}${KADEPLOY_ENV_INITRD} /sbin/kexec -l $kernel --initrd=$initrd --append="root=/dev/disk/by-partlabel/${KADEPLOY_DEPLOY_LABEL} ${KADEPLOY_ENV_KERNEL_PARAMS}" elif [ $KADEPLOY_KEXEC_KIND = "to_deploy_kernel" ]; then - kernel=${KADEPLOY_ENV_KEXEC_REPOSITORY}/kadeploy3-deploy-kernel-buster.vmlinuz - initrd=${KADEPLOY_ENV_KEXEC_REPOSITORY}/kadeploy3-deploy-kernel-buster.initrd.img + kernel=${KADEPLOY_ENV_KEXEC_REPOSITORY}/kadeploy3-deploy-kernel-bookworm.vmlinuz + initrd=${KADEPLOY_ENV_KEXEC_REPOSITORY}/kadeploy3-deploy-kernel-bookworm.initrd.img /sbin/kexec -l $kernel --initrd=$initrd --append="${KADEPLOY_DEPLOY_ENV_KERNEL_PARAMS}" fi systemctl kexec