Merge pull request #289 from shinesolutions/remove-agent-ahead-of-hea…

…lthcheck Moved "Remove all agents" step ahead of healthcheck during provisioni…
shinesolutions · Oct 25, 2024 · e87dd74 · e87dd74
2 parents 51089c2 + c5c32fa
commit e87dd74
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 46 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Fixed incorrect syntax in RTK config file
 
+### Changed
+- Moved "Remove all agents" step ahead of healthcheck during provisioning
+- Added authentication to Stop webdav/davex bundle step
+
+
 ## [4.1.7] - 2024-09-11
 ### Added
 - Added new AEM profile: aem65_sp17

diff --git a/manifests/config_author_primary.pp b/manifests/config_author_primary.pp
@@ -346,10 +346,29 @@
     enable_truststore_removal  => $enable_truststore_removal,
     run_mode                   => $run_mode,
     tmp_dir                    => $tmp_dir,
+  } -> aem_curator::config_aem_agents { "${aem_id}: Remove all agents":
+    run_mode                 => 'author',
+    aem_id                   => $aem_id,
+    enable_remove_all_agents => $enable_remove_all_agents,
+  } -> aem_aem { "${aem_id}: Wait until login page is ready after removing all agents":
+    ensure                     => login_page_is_ready,
+    retries_max_tries          => $login_ready_max_tries,
+    retries_base_sleep_seconds => $login_ready_base_sleep_seconds,
+    retries_max_sleep_seconds  => $login_ready_max_sleep_seconds,
+    aem_id                     => $aem_id,
+  } -> aem_aem { "${aem_id}: Wait until aem health check is ok after removing all agents":
+    ensure                     => aem_health_check_is_ok,
+    retries_max_tries          => $login_ready_max_tries,
+    retries_base_sleep_seconds => $login_ready_base_sleep_seconds,
+    retries_max_sleep_seconds  => $login_ready_max_sleep_seconds,
+    tags                       => 'deep',
+    aem_id                     => $aem_id,
   } -> aem_bundle { "${aem_id}: Stop webdav bundle":
-    ensure => stopped,
-    name   => 'org.apache.sling.jcr.webdav',
-    aem_id => $aem_id,
+    ensure       => stopped,
+    name         => 'org.apache.sling.jcr.webdav',
+    aem_username => 'admin',
+    aem_password => $credentials_hash['admin'],
+    aem_id       => $aem_id,
   } -> aem_aem { "${aem_id}: Wait until login page is ready after stopping webdav bundle":
     ensure                     => login_page_is_ready,
     retries_max_tries          => $login_ready_max_tries,
@@ -364,9 +383,11 @@
     tags                       => 'deep',
     aem_id                     => $aem_id,
   } -> aem_bundle { "${aem_id}: Stop davex bundle":
-    ensure => stopped,
-    name   => 'org.apache.sling.jcr.davex',
-    aem_id => $aem_id,
+    ensure       => stopped,
+    name         => 'org.apache.sling.jcr.davex',
+    aem_username => 'admin',
+    aem_password => $credentials_hash['admin'],
+    aem_id       => $aem_id,
   } -> aem_aem { "${aem_id}: Wait until login page is ready after stopping davex bundle":
     ensure                     => login_page_is_ready,
     retries_max_tries          => $login_ready_max_tries,
@@ -401,23 +422,6 @@
     retries_max_sleep_seconds  => $login_ready_max_sleep_seconds,
     tags                       => 'deep',
     aem_id                     => $aem_id,
-  } -> aem_curator::config_aem_agents { "${aem_id}: Remove all agents":
-    run_mode                 => 'author',
-    aem_id                   => $aem_id,
-    enable_remove_all_agents => $enable_remove_all_agents,
-  } -> aem_aem { "${aem_id}: Wait until login page is ready after removing all agents":
-    ensure                     => login_page_is_ready,
-    retries_max_tries          => $login_ready_max_tries,
-    retries_base_sleep_seconds => $login_ready_base_sleep_seconds,
-    retries_max_sleep_seconds  => $login_ready_max_sleep_seconds,
-    aem_id                     => $aem_id,
-  } -> aem_aem { "${aem_id}: Wait until aem health check is ok after removing all agents":
-    ensure                     => aem_health_check_is_ok,
-    retries_max_tries          => $login_ready_max_tries,
-    retries_base_sleep_seconds => $login_ready_base_sleep_seconds,
-    retries_max_sleep_seconds  => $login_ready_max_sleep_seconds,
-    tags                       => 'deep',
-    aem_id                     => $aem_id,
   } -> aem_curator::config_truststore { "${aem_id}: Configure AEM Truststore":
     aem_id                      => $aem_id,
     enable_truststore_creation  => $enable_truststore_creation,

diff --git a/manifests/config_publish.pp b/manifests/config_publish.pp
@@ -330,10 +330,29 @@
     enable_truststore_removal  => $enable_truststore_removal,
     run_mode                   => $run_mode,
     tmp_dir                    => $tmp_dir,
+  } -> aem_curator::config_aem_agents { "${aem_id}: Remove all agents":
+    run_mode                 => 'publish',
+    aem_id                   => $aem_id,
+    enable_remove_all_agents => $enable_remove_all_agents,
+  } -> aem_aem { "${aem_id}: Wait until login page is ready after removing all agents":
+    ensure                     => login_page_is_ready,
+    retries_max_tries          => $login_ready_max_tries,
+    retries_base_sleep_seconds => $login_ready_base_sleep_seconds,
+    retries_max_sleep_seconds  => $login_ready_max_sleep_seconds,
+    aem_id                     => $aem_id,
+  } -> aem_aem { "${aem_id}: Wait until aem health check is ok after removing all agents":
+    ensure                     => aem_health_check_is_ok,
+    retries_max_tries          => $login_ready_max_tries,
+    retries_base_sleep_seconds => $login_ready_base_sleep_seconds,
+    retries_max_sleep_seconds  => $login_ready_max_sleep_seconds,
+    tags                       => 'deep',
+    aem_id                     => $aem_id,
   } -> aem_bundle { "${aem_id}: Stop webdav bundle":
-    ensure => stopped,
-    name   => 'org.apache.sling.jcr.webdav',
-    aem_id => $aem_id,
+    ensure       => stopped,
+    name         => 'org.apache.sling.jcr.webdav',
+    aem_username => 'admin',
+    aem_password => $credentials_hash['admin'],
+    aem_id       => $aem_id,
   } -> aem_aem { "${aem_id}: Wait until login page is ready after stopping webdav bundle":
     ensure                     => login_page_is_ready,
     retries_max_tries          => $login_ready_max_tries,
@@ -348,9 +367,11 @@
     tags                       => 'deep',
     aem_id                     => $aem_id,
   } -> aem_bundle { "${aem_id}: Stop davex bundle":
-    ensure => stopped,
-    name   => 'org.apache.sling.jcr.davex',
-    aem_id => $aem_id,
+    ensure       => stopped,
+    name         => 'org.apache.sling.jcr.davex',
+    aem_username => 'admin',
+    aem_password => $credentials_hash['admin'],
+    aem_id       => $aem_id,
   } -> aem_aem { "${aem_id}: Wait until login page is ready after stopping davex bundle":
     ensure                     => login_page_is_ready,
     retries_max_tries          => $login_ready_max_tries,
@@ -385,23 +406,6 @@
     retries_max_sleep_seconds  => $login_ready_max_sleep_seconds,
     tags                       => 'deep',
     aem_id                     => $aem_id,
-  } -> aem_curator::config_aem_agents { "${aem_id}: Remove all agents":
-    run_mode                 => 'publish',
-    aem_id                   => $aem_id,
-    enable_remove_all_agents => $enable_remove_all_agents,
-  } -> aem_aem { "${aem_id}: Wait until login page is ready after removing all agents":
-    ensure                     => login_page_is_ready,
-    retries_max_tries          => $login_ready_max_tries,
-    retries_base_sleep_seconds => $login_ready_base_sleep_seconds,
-    retries_max_sleep_seconds  => $login_ready_max_sleep_seconds,
-    aem_id                     => $aem_id,
-  } -> aem_aem { "${aem_id}: Wait until aem health check is ok after removing all agents":
-    ensure                     => aem_health_check_is_ok,
-    retries_max_tries          => $login_ready_max_tries,
-    retries_base_sleep_seconds => $login_ready_base_sleep_seconds,
-    retries_max_sleep_seconds  => $login_ready_max_sleep_seconds,
-    tags                       => 'deep',
-    aem_id                     => $aem_id,
   } -> aem_curator::config_truststore { "${aem_id}: Configure AEM Truststore":
     aem_id                      => $aem_id,
     enable_truststore_creation  => $enable_truststore_creation,