diff options
| -rw-r--r-- | patches/opnfv-fuel/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch | 2 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch | 2 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0018-states-maas-Batch-apply-linux-state-with-b-4.patch (renamed from patches/opnfv-fuel/0018-salt-master-Increase-command_timeout-to-15s.patch) | 18 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0019-states-maas-rm-Ubuntu-boot-entry-on-EFI-systems.patch | 2 |
4 files changed, 14 insertions, 10 deletions
diff --git a/patches/opnfv-fuel/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch b/patches/opnfv-fuel/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch index e238250c..26b0dc33 100644 --- a/patches/opnfv-fuel/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch +++ b/patches/opnfv-fuel/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch @@ -25,7 +25,7 @@ index b841e88..17fbbfc 100644 ram: 4096 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml -index 5862ddb..ab14c58 100644 +index 5862ddb..2374dee 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml @@ -51,7 +51,7 @@ parameters: diff --git a/patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch b/patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch index 4a159446..5bbe783a 100644 --- a/patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch +++ b/patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch @@ -41,7 +41,7 @@ index 1e14e5f..db0241b 100755 wait_for 10 "salt -C 'mas01*' state.apply maas.region" diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml -index ab14c58..25746b5 100644 +index 2374dee..fb5b856 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml @@ -16,19 +16,19 @@ parameters: diff --git a/patches/opnfv-fuel/0018-salt-master-Increase-command_timeout-to-15s.patch b/patches/opnfv-fuel/0018-states-maas-Batch-apply-linux-state-with-b-4.patch index 3380de0a..3f4986b4 100644 --- a/patches/opnfv-fuel/0018-salt-master-Increase-command_timeout-to-15s.patch +++ b/patches/opnfv-fuel/0018-states-maas-Batch-apply-linux-state-with-b-4.patch @@ -1,12 +1,16 @@ From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> Date: Thu, 24 Aug 2017 03:50:11 +0200 -Subject: [PATCH] salt-master: Increase command_timeout to 15s +Subject: [PATCH] states: maas: Batch apply linux state with `-b 4` -Default command timeout (10s) is sometimes too small for all minions -to return within the required timeslot. Increase it by 50%. +Applying heavy states like linux.network on multiple nodes in +parallel might lead to spurious timeouts on slower systems. -While at it, increase the timeout used for executing the "linux" -state against all nodes to 60s, just to be on the safe side. +Compromise between speed and realiability by applying this state +in batches of 4 nodes at once. + +While at it, increase global command_timeout to 15s on Salt master, +since default command timeout (10s) is sometimes too small for all +minions to return within the required timeslot. Increase it by 50%. Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- @@ -15,7 +19,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index 12ef9ed..14f32ee 100755 +index 12ef9ed..697f83c 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas @@ -107,4 +107,4 @@ wait_for 10 "salt -C '* and not cfg01* and not mas01*' ssh.set_auth_key ${SUDO_U @@ -23,7 +27,7 @@ index 12ef9ed..14f32ee 100755 wait_for 10 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all" wait_for 10 "salt -C '* and not cfg01* and not mas01*' state.apply salt" -wait_for 10 "salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp" -+wait_for 10 "salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp -t 60" ++wait_for 10 "salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp -b 4" diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml index 7d95ebc..46526da 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml diff --git a/patches/opnfv-fuel/0019-states-maas-rm-Ubuntu-boot-entry-on-EFI-systems.patch b/patches/opnfv-fuel/0019-states-maas-rm-Ubuntu-boot-entry-on-EFI-systems.patch index 792774f3..cc9be244 100644 --- a/patches/opnfv-fuel/0019-states-maas-rm-Ubuntu-boot-entry-on-EFI-systems.patch +++ b/patches/opnfv-fuel/0019-states-maas-rm-Ubuntu-boot-entry-on-EFI-systems.patch @@ -24,7 +24,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 1 file changed, 5 insertions(+) diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index 14f32ee..b9f3ac6 100755 +index 697f83c..383063d 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas @@ -44,6 +44,11 @@ function maas_fixup() { |