From 65f9bf4ad6092cda28f4544d0de8710ce06ee8f8 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 1 Nov 2021 17:31:04 +0900 Subject: [PATCH] Tag the httpd service only when it is used Currently the placement-service tag is always added to the httpd service, but it should not if an independent service is used to run placement-api. Change-Id: If39b4cabadc2d7d5c33ef7ac2b56d6adfdcdf456 (cherry picked from commit 8475c1afed91ded3e393c1e2f41daf8c98b95bde) (cherry picked from commit 14ee3c820b89597dd95d3abd2c335ac7a4075d03) (cherry picked from commit 568b61b585f710a778e34a83a3c6a21b17c77b55) (cherry picked from commit 314bbbcc72320fc71fd6092e720d8b7a3ae819f8) (cherry picked from commit 9e4cf669ba037df9fb8e04b11c40bd560381882e) --- manifests/api.pp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/manifests/api.pp b/manifests/api.pp index 4a5c2c7..165d7d8 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -62,11 +62,10 @@ class placement::api ( Service['placement-api'] -> Service[$api_service_name] } $api_service_name_real = false + Service <| title == 'httpd' |> { tag +> 'placement-service' } } else { $api_service_name_real = $api_service_name } - - Service <| title == 'httpd' |> { tag +> 'placement-service' } } else { $api_service_name_real = $api_service_name }