From 1a346e6561f06f126024d4fdb9bf521c0affcde0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Wed, 9 Jun 2021 14:15:33 +0200 Subject: [PATCH] baremetal: let installer.service retry on failure In case the network only has a temporary problem, the installer service should start again on failure. Convert it to a oneshot service to set RemainAfterExist, so that it is not triggered twice if anything that depends on it is pulling it in again after it finished. --- .../matchbox-flatcar/templates/install.yaml.tmpl | 5 ++++- pkg/assets/generated_assets.go | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/assets/terraform-modules/matchbox-flatcar/templates/install.yaml.tmpl b/assets/terraform-modules/matchbox-flatcar/templates/install.yaml.tmpl index 556ec6c4e..eec3ffd4e 100644 --- a/assets/terraform-modules/matchbox-flatcar/templates/install.yaml.tmpl +++ b/assets/terraform-modules/matchbox-flatcar/templates/install.yaml.tmpl @@ -8,7 +8,10 @@ systemd: Requires=network-online.target After=network-online.target [Service] - Type=simple + Type=oneshot + RemainAfterExit=true + Restart=on-failure + RestartSec=10s ExecStart=/opt/installer [Install] WantedBy=multi-user.target diff --git a/pkg/assets/generated_assets.go b/pkg/assets/generated_assets.go index c29ebc922..a06d92a7a 100644 --- a/pkg/assets/generated_assets.go +++ b/pkg/assets/generated_assets.go @@ -6594,9 +6594,9 @@ var vfsgenAssets = func() http.FileSystem { "/terraform-modules/matchbox-flatcar/templates/install.yaml.tmpl": &vfsgen۰CompressedFileInfo{ name: "install.yaml.tmpl", modTime: time.Date(1970, 1, 1, 0, 0, 1, 0, time.UTC), - uncompressedSize: 1922, + uncompressedSize: 2002, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\x55\x41\x6f\xdb\x46\x13\xbd\xfb\x57\xcc\x27\xeb\x6b\x5a\x20\xa4\x1c\x01\xbd\x08\x50\x0a\xbb\x35\xd0\x02\x0e\x02\xd4\x69\x7a\x48\x03\x62\xc9\x1d\x4a\x5b\x2d\x67\xe9\x9d\x59\xcb\x2c\xad\xfc\xf6\x62\x49\x51\xa6\x6c\xa5\xed\x8d\x9a\x79\xf3\x76\x76\xde\xdb\x51\x92\x24\x67\xdc\xb0\x60\xa5\x17\x67\x00\x81\x8c\x70\xfc\x00\x48\x80\x54\x85\x0b\x30\xc4\xa2\xac\x45\x9f\x32\xfa\x7b\x53\x60\x97\x05\x40\x52\xb9\xc5\x05\x88\x0f\x43\xa8\x70\x24\x48\xc2\x0b\x78\xdc\x47\x00\x3e\xfd\x46\x46\x3e\x1f\x7e\xfe\x8a\x77\xc1\x78\xe4\x25\xa1\x6c\x9d\xdf\x24\x8e\xac\x21\x4c\x45\xf9\x15\xca\x01\x76\x59\x0a\xfa\x7f\xc1\x7c\xba\xed\xfb\x79\x22\xff\xd0\xd4\xb8\x64\x53\xd5\x16\x0f\xb1\xeb\x07\x2c\x6e\x45\x79\x59\xce\x5c\x2d\xb3\xc3\x6d\x9e\x68\x7e\xe9\x43\x4f\x34\xbf\x2b\x12\xd4\x57\xcd\xb2\x0a\x56\x4c\x12\x18\xfd\xf8\xec\x73\xb8\xbc\x77\x46\x43\x60\x43\x2b\x90\x35\x02\x8b\x22\xad\xbc\x86\xdb\xdb\x9f\xa1\x76\x5e\x80\x1d\x7c\x40\xef\x55\xe9\x7c\x05\xaa\xae\x6d\x03\x85\x22\x72\xd2\x41\x02\x89\xb1\x7b\xae\xda\xb1\x24\xfb\xae\x52\xb8\x0a\x02\x4a\x57\x86\x18\x2a\xd5\x74\x60\x71\xa0\x31\x0f\x2b\xd0\x86\x37\x83\x1a\x50\x7b\x97\x5b\xac\x38\x1d\x5a\x8a\x03\x1b\xb2\xaf\x81\x79\xad\x61\x6b\xac\x85\xc0\xd8\xb7\x34\x9f\x83\xa2\xd8\x35\x7a\x9e\x3d\x35\x57\x28\x8a\xba\x11\x16\x92\x1e\xe9\x1e\x29\x52\x76\xc5\xe6\x30\x72\xed\x5d\x6d\x68\x6f\x8f\x31\xf4\xcd\x45\x12\xd1\x49\x3c\x27\x2d\x1c\x95\x07\xc4\x69\x4f\xf4\xea\x75\xd4\x9f\x8f\x82\x37\x86\x05\xe9\x56\x3c\xaa\x6a\xf9\xf5\xcc\x7c\x3e\x9f\x9f\xb1\x38\xaf\x56\x18\xbb\x29\x8d\xc5\x83\x6b\x6b\x25\xeb\x05\x9c\x14\xbb\xc3\x75\x66\x5f\x80\x77\x6e\xb8\x57\xe5\x34\x2e\xe0\xe2\xfb\x8b\x8b\xe7\x3e\x3e\xb4\x60\x3a\x07\x1e\xdf\xe1\xfc\x7f\xb3\xdc\xd0\x2c\x57\xbc\x86\x04\x1f\xc6\x19\x08\x54\xb9\x40\x02\x8a\x1a\xb0\x58\x8a\xbb\x47\xcf\xa0\xa4\xb3\x4b\x8e\x2b\x43\x14\xcd\x93\x63\xe9\x3c\xc2\x16\x63\x0f\xa6\x6c\xba\x74\xa7\x73\xfc\xe8\x29\x02\x23\x8f\xb8\x43\x1f\x9d\x49\x55\xcf\x1c\x56\x25\xc3\xe3\xe3\xf8\x0d\x76\xfd\x07\x6f\x21\x49\x3c\x8a\x6f\xe0\xcd\x05\x4c\xa6\xad\x59\x91\x11\xe3\x28\x43\xd2\xb5\x33\x24\xbb\x1f\xda\x36\xf5\x78\x17\x90\x25\xf5\x6a\x9b\xdd\x05\xf4\xcd\x6e\xf7\x8d\xe3\xe5\x30\x37\x3d\x81\xc4\xc1\x50\x9a\xfe\xc9\x8e\x46\xa7\x94\x56\x49\xa1\xfc\x60\x5e\xf8\xe3\x48\xb0\xff\xb7\x5f\xc0\x94\x83\x23\x33\x71\x19\x57\x91\x93\x25\xeb\x2e\xf8\x65\x77\x04\x4f\xf8\x44\x3d\x5a\xc6\x17\x40\x0d\xd3\x76\x60\x8d\x4c\xbb\x53\x85\xa4\x4d\xf9\xa2\xf2\x47\x98\xb6\x8e\xb3\x62\xad\x88\xd0\x3e\xaf\x4b\x3e\xf6\xe9\xa8\x94\x71\xf4\x22\xed\xe2\x18\xa3\x33\x94\x21\xf4\x99\x35\x14\x1e\x32\x87\xd5\x6e\xf2\x0c\x39\x6d\x73\xc5\x18\xbc\xcd\x4a\xab\x56\x2f\x78\xcc\x57\x07\x1a\x34\xde\x2b\x5d\x01\xa3\x88\x1d\xeb\xf9\xfe\xfa\x5d\xf6\xd3\xf5\xc7\xe5\x64\xfa\x6d\x6e\x37\x46\x43\x22\x30\xb9\xb9\xbc\xba\xbe\x59\xbe\xbf\x7e\xd7\x89\xa4\x31\xae\xc2\xef\x26\xa3\xaa\x6a\xa3\x8d\x87\xa4\x1e\x79\x65\x9c\xed\x6c\x34\x99\x4e\xdb\x3d\xfb\x6e\x72\x1a\x78\x1e\xf7\x17\x92\x8e\x8b\x28\x3e\x20\x70\x04\x84\xdb\xb8\xd1\x3c\x2a\x41\x0d\xb5\xf2\xd2\x5d\xe8\x35\x68\x07\x71\xc9\x79\xac\xdc\x3d\xf6\x6e\xc6\x52\x05\x2b\x63\x46\x2c\xd6\x0e\x5e\x31\x0a\xf4\x43\xec\xf9\x97\x93\x69\xbb\x41\x4f\x68\x33\xe5\x57\xbc\x9b\xbc\x82\xb7\x6f\x47\x2d\xcd\x56\x3e\xe4\x69\x51\xae\xfe\x81\xa9\x70\xc4\xce\xe2\x88\x6a\x1f\xf9\x4f\x6c\x2f\x9e\xd6\x28\xd7\xaf\x8d\x42\x2c\x78\xcc\xe3\xea\xa8\x15\xf3\xb6\xff\xcf\x8c\x1b\xf5\xf8\x3f\xb3\x70\x7e\xd0\x8f\x79\x9d\xa9\x20\x6b\xe7\xcd\x5f\xa8\xb3\x0d\x36\xbc\x80\x69\x1b\xc3\xf1\x7b\x77\xf6\x77\x00\x00\x00\xff\xff\xec\xdb\x6a\xf4\x82\x07\x00\x00"), + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\x55\x51\x6f\xdb\x46\x0c\x7e\xcf\xaf\xe0\x1c\x6f\xdd\x80\x4a\x76\x0c\xec\xc5\x80\x3a\x24\x9b\x81\x0d\x48\x51\x60\xee\xba\x87\xae\x10\x4e\x3a\xca\xbe\xf9\xc4\x53\x8e\xbc\x38\x9e\xe3\xfe\xf6\xe1\x24\xdb\x91\xe3\x74\xeb\x9b\x44\x7e\xfc\xf4\xdd\xf1\x23\x95\x24\xc9\x05\x6f\x58\xb0\xd6\xd3\x0b\x80\x40\x46\x38\x3e\x00\x24\x40\xaa\xc6\x29\x18\x62\x51\xd6\xa2\x4f\x19\xfd\xbd\x29\xb1\xcd\x02\x20\xa9\xc2\xe2\x14\xc4\x87\x43\xa8\x74\x24\x48\xc2\x53\x78\xdc\x47\x00\x3e\xfe\x41\x46\x3e\x1d\x5f\x7f\xc7\xbb\x60\x3c\x72\x46\x28\x6b\xe7\x57\x89\x23\x6b\x08\x53\x51\x7e\x81\x72\x84\x5d\x57\x82\xfe\x7f\x30\x1f\xe7\x9d\x9e\x27\xf2\xf7\x9b\x06\x33\x47\xc8\x4b\x27\xbd\x2f\xd6\xca\x50\x4b\x38\x7b\x30\x92\xf5\xf4\xc6\x24\x8b\xf2\x92\x39\x4a\x2a\x65\x6c\xf0\x67\xa9\x39\x96\xd9\xd5\x98\x8f\xe1\xd9\x03\x96\xf3\xb6\x66\xe4\x1a\x19\x1d\x6f\xe7\x49\xd6\x6f\x5d\xe8\x49\xd6\x9f\x8a\x04\xf5\xcd\x26\xab\x83\x15\x93\x04\x46\xdf\x3f\xcb\x25\x5c\xdf\x3b\xa3\x21\xb0\xa1\x05\xc8\x12\x81\x45\x91\x56\x5e\xc3\x7c\xfe\x2b\x34\xce\x0b\xb0\x83\xf7\xe8\xbd\xaa\x9c\xaf\x41\x35\x8d\xdd\x40\xa9\x88\x9c\xb4\x90\x40\x62\xec\x9e\xab\x71\x2c\xc9\x5e\x55\x0a\x37\x41\x40\xe9\xda\x10\x43\xad\x36\x2d\x58\x1c\x68\x2c\xc2\x02\xb4\xe1\xd5\xa1\xbb\xd0\x78\x57\x58\xac\x39\x3d\x48\x8a\xf7\x75\xc8\xbe\x06\xe6\xa5\x86\xb5\xb1\x16\x02\x63\x27\x69\x32\x01\x45\x51\x35\x7a\x1e\x3d\x89\x2b\x15\x45\x1f\x10\x96\x92\x9e\xf8\x28\x52\xa4\xec\xca\xd5\xb1\x85\xda\xbb\xc6\xd0\xde\x6e\x7d\xe8\xd5\x38\x89\xe8\x24\x7e\x27\x2d\x1d\x55\x47\xc4\xcb\x1e\xeb\xdc\xd0\x52\x7f\x3a\x09\xde\x1a\x16\xa4\xb9\x78\x54\x75\xf6\xe5\xcc\x64\x32\x99\x5c\xb0\x38\xaf\x16\x18\xd5\x54\xc6\xe2\x71\x0a\x1a\x25\xcb\x29\xbc\xd8\xec\x16\xd7\x0e\xcf\x14\xbc\x3b\x7a\xae\x76\x1a\xa7\x30\xfe\x71\x3c\x7e\x3e\x17\x47\x09\xa6\x75\xf4\xe9\x19\x2e\xbf\x19\x15\x86\x46\x85\xe2\x25\x24\xf8\xd0\xcf\x40\xa0\xda\x05\x12\x50\xb4\x01\x8b\x95\xb8\x7b\xf4\x0c\x4a\x5a\xbb\x14\xb8\x30\x44\xd1\x3c\x05\x56\xce\x23\xac\x31\x6a\x30\xd5\xa6\x4d\xb7\x7d\x8e\x0f\x1d\x45\x60\xe4\x1e\x77\xe8\xa2\x23\xa9\x9b\x91\xc3\xba\x62\x78\x7c\x84\x93\x19\x01\x28\x83\xb7\x90\x24\x1e\xc5\x6f\xe0\x6a\x0c\x83\xe1\xd6\x2c\xc8\x88\x71\x94\x23\xe9\xc6\x19\x92\xdd\x4f\xdb\x6d\xea\xf1\x2e\x20\x4b\xea\xd5\x3a\xbf\x0b\xe8\x37\xbb\xdd\x77\x8e\xb3\xc3\xbd\xe9\x01\x24\x0e\x0e\xa5\xe9\xdf\xec\xa8\xf7\x95\xca\x2a\x29\x95\x3f\x98\x17\xfe\x3a\x69\xd8\xb7\xdb\xcf\x60\xaa\x83\x23\x73\x71\x39\xd7\x91\x93\x25\x6f\x0f\xf8\x79\x77\x02\x4f\xf8\x85\x7a\xb4\x8c\x67\x40\x0d\xc3\xed\x81\x35\x32\xed\x5e\x2a\x24\x6d\xaa\xb3\xca\x9f\x61\xb8\x75\x9c\x97\x4b\x45\x84\xf6\x79\x5d\xf2\xa1\x4b\xc7\x4e\x19\x47\x67\x69\x17\xaf\x31\x3a\x43\x19\x42\x9f\x5b\x43\xe1\x21\x77\x58\xef\x06\xcf\x90\xc3\x6d\xa1\x18\x83\xb7\x79\x65\xd5\xe2\x8c\xc7\x7c\xf1\x42\x83\xc6\x7b\xa5\x6b\x60\x14\xb1\xfd\x7e\xbe\x9b\xbd\xcd\x7f\x99\x7d\xc8\x06\xc3\xef\x0b\xbb\x32\x1a\x12\x81\xc1\xed\xf5\xcd\xec\x36\x7b\x37\x7b\xdb\x36\x49\x63\x5c\xad\x3f\x0c\x7a\x55\xf5\x4a\x1b\x0f\x49\xd3\xf3\x4a\x3f\xdb\xda\x68\x30\x1c\x6e\xf7\xec\xbb\xc1\xcb\xc0\xcb\xb8\xbf\x90\x74\x5c\x44\x71\x80\xc0\x11\x10\xae\xe3\x46\xf3\xa8\x04\x35\x34\xca\x4b\x7b\xa0\xd7\xa0\x1d\xc4\x25\xe7\xb1\x76\xf7\xd8\xb9\x19\x2b\x15\xac\xf4\x19\xb1\x5c\x3a\x78\xc5\x28\xd0\x5d\x62\xc7\x9f\x0d\x86\xdb\x15\x7a\x42\x9b\x2b\xbf\xe0\xdd\xe0\x15\xbc\x79\xd3\x93\x34\x5a\xf8\x50\xa4\x65\xb5\xf8\x0f\xa6\xd2\x11\x3b\x8b\x3d\xaa\x7d\xe4\xab\xd8\xce\x46\xab\x97\xeb\xd6\x46\x29\x16\x3c\x16\x71\x75\x34\x8a\x79\xdd\xfd\x83\xe3\x46\x3d\xfd\x07\x97\xee\xf8\x63\x62\x5e\xe6\x2a\xc8\xd2\x79\xf3\x0f\xea\x7c\x85\x1b\x9e\xc2\x70\x1b\xc3\xf1\x79\x77\xf1\x6f\x00\x00\x00\xff\xff\x52\xdb\x09\x1c\xd2\x07\x00\x00"), }, "/terraform-modules/matchbox-flatcar/variables.tf": &vfsgen۰CompressedFileInfo{ name: "variables.tf",