Merge "Set ksa retry conf options for n-cpu [ironic]"