File tree 2 files changed +2
-3
lines changed
2 files changed +2
-3
lines changed Original file line number Diff line number Diff line change @@ -78,9 +78,8 @@ locals {
78
78
gitlab_runner_access_level = var.runner_gitlab_registration_config.access_level
79
79
sentry_dsn = var.runner_manager.sentry_dsn
80
80
public_key = var.runner_worker.use_private_key && var.runner_worker.type == " docker-autoscaler" ? tls_private_key.autoscaler[0 ].public_key_openssh : var.runner_worker_docker_machine_fleet.enable == true ? tls_private_key.fleet[0 ].public_key_openssh : " "
81
- use_fleet = var.runner_worker_docker_machine_fleet.enable
82
81
private_key = var.runner_worker.use_private_key && var.runner_worker.type == " docker-autoscaler" ? tls_private_key.autoscaler[0 ].private_key_pem : var.runner_worker_docker_machine_fleet.enable == true ? tls_private_key.fleet[0 ].private_key_pem : " "
83
- use_private_key = var.runner_worker.use_private_key && var.runner_worker.type == " docker-autoscaler"
82
+ use_private_key = var.runner_worker_docker_machine_fleet.enable || (var. runner_worker.use_private_key && var.runner_worker.type == " docker-autoscaler" )
84
83
use_new_runner_authentication_gitlab_16 = var.runner_gitlab_registration_config.type != " "
85
84
user_data_trace_log = var.debug.trace_runner_user_data
86
85
fleeting_plugin_version = var.runner_worker_docker_autoscaler.fleeting_plugin_version
Original file line number Diff line number Diff line change 130
130
sed - i.bak s/ __REPLACED_BY_USER_DATA__/ $token/ g / etc/ gitlab- runner/ config.toml
131
131
fi
132
132
133
- if [[ " ${ use_fleet } " == " true " || " ${ use_private_key } " == " true" ]]
133
+ if [[ " ${ use_private_key } " == " true" ]]
134
134
then
135
135
echo " ${ public_key } " > / root/ .ssh/ id_rsa.pub
136
136
echo " ${ private_key } " > / root/ .ssh/ id_rsa
You can’t perform that action at this time.
0 commit comments