Skip to content

Commit 29e0a99

Browse files
committed
PMM-14185 handle gssapi
1 parent 977a2de commit 29e0a99

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

pmm_psmdb-pbm_setup/configure-agents.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,13 @@ client_credentials_flags="--username=${pmm_mongo_user} --password=${pmm_mongo_us
1313
gssapi_service_name_part=""
1414

1515
if [[ $gssapi_enabled == "true" ]]; then
16-
client_credentials_flags="--username=${gssapi_username} --password=${gssapi_password} --authentication-mechanism=GSSAPI --authentication-database=\"\$external\""
17-
gssapi_service_name_part="_gssapi"
16+
client_credentials_flags=(
17+
--username="$gssapi_username"
18+
--password="$gssapi_password"
19+
--authentication-mechanism=GSSAPI
20+
--authentication-database='$external'
21+
)
22+
gssapi_service_name_part="_gssapi"
1823
fi
1924

2025
echo
@@ -50,7 +55,7 @@ do
5055
else
5156
echo
5257
echo "docker compose -f docker-compose-rs.yaml exec -T $node pmm-admin add mongodb --enable-all-collectors --agent-password=mypass --cluster=replicaset --replication-set=rs ${client_credentials_flags} --host=${node} --port=27017 ${node}${gssapi_service_name_part}_${random_number}"
53-
docker compose -f docker-compose-rs.yaml exec -T $node pmm-admin add mongodb --enable-all-collectors --agent-password=mypass --cluster=replicaset --replication-set=rs ${client_credentials_flags} --host=${node} --port=27017 ${node}${gssapi_service_name_part}_${random_number}
58+
docker compose -f docker-compose-rs.yaml exec -T $node pmm-admin add mongodb --enable-all-collectors --agent-password=mypass --cluster=replicaset --replication-set=rs "${client_credentials_flags}" --host=${node} --port=27017 ${node}${gssapi_service_name_part}_${random_number}
5459
fi
5560
done
5661
echo

pmm_psmdb-pbm_setup/configure-extra-agents.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,13 @@ client_credentials_flags="--username=${pmm_mongo_user} --password=${pmm_mongo_us
1313
gssapi_service_name_part=""
1414

1515
if [[ $gssapi_enabled == "true" ]]; then
16-
client_credentials_flags="--username=${gssapi_username} --password=${gssapi_password} --authentication-mechanism=GSSAPI --authentication-database=\"\$external\""
17-
gssapi_service_name_part="_gssapi"
16+
client_credentials_flags=(
17+
--username="$gssapi_username"
18+
--password="$gssapi_password"
19+
--authentication-mechanism=GSSAPI
20+
--authentication-database='$external'
21+
)
22+
gssapi_service_name_part="_gssapi"
1823
fi
1924

2025
echo

0 commit comments

Comments
 (0)