From ca3d03cc86f5b47e88428ab28a904638dc8139c0 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 11 Aug 2023 18:29:43 +0900 Subject: [PATCH] Remove redundant order enforcement about apache installation Now we enforce keystone packages are installed before we call the apache class, thus we no longer need to set the dependency between package installation and a specific resource called by the apache class. Change-Id: I9113769d2e973b81480e0fb8c34693490a8ca81f --- manifests/deps.pp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/manifests/deps.pp b/manifests/deps.pp index b9a5a0add..71ae28b02 100644 --- a/manifests/deps.pp +++ b/manifests/deps.pp @@ -80,11 +80,6 @@ class keystone::deps { Anchor['keystone::install::end'] ~> Anchor['keystone::service::begin'] Anchor['keystone::config::end'] ~> Anchor['keystone::service::begin'] - # Install the package before the Apache module purges wsgi-keystone.conf. - # Otherwise, the run isn't idempotent. - Package<| tag == 'keystone-package'|> -> File<| title == '/etc/apache2/sites-enabled' |> - Package<| tag == 'keystone-package'|> -> File<| title == '/etc/apache2/sites-available' |> - # Bootstrap needs to be executed after fernet keys are created/generated. Exec<| title == 'keystone-manage fernet_setup' |> -> Exec<| title == 'keystone bootstrap' |> File<| tag == 'keystone-fernet-key' |> -> Exec<| title == 'keystone bootstrap' |>