Skip to content

Revert ‘e87dd74’ - Remove All Agents step ahead of healthcheck #293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ovlords merged 1 commit into from
Jan 31, 2025
Merged

Revert ‘e87dd74’ - Remove All Agents step ahead of healthcheck #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@ 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
Expand Down
50 changes: 23 additions & 27 deletions manifests/config_author_primary.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,29 +346,10 @@
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_username => 'admin',
aem_password => $credentials_hash['admin'],
aem_id => $aem_id,
ensure => stopped,
name => 'org.apache.sling.jcr.webdav',
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,
Expand All @@ -383,11 +364,9 @@
tags => 'deep',
aem_id => $aem_id,
} -> aem_bundle { "${aem_id}: Stop davex bundle":
ensure => stopped,
name => 'org.apache.sling.jcr.davex',
aem_username => 'admin',
aem_password => $credentials_hash['admin'],
aem_id => $aem_id,
ensure => stopped,
name => 'org.apache.sling.jcr.davex',
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,
Expand Down Expand Up @@ -422,6 +401,23 @@
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,
Expand Down
50 changes: 23 additions & 27 deletions manifests/config_publish.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,29 +330,10 @@
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_username => 'admin',
aem_password => $credentials_hash['admin'],
aem_id => $aem_id,
ensure => stopped,
name => 'org.apache.sling.jcr.webdav',
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,
Expand All @@ -367,11 +348,9 @@
tags => 'deep',
aem_id => $aem_id,
} -> aem_bundle { "${aem_id}: Stop davex bundle":
ensure => stopped,
name => 'org.apache.sling.jcr.davex',
aem_username => 'admin',
aem_password => $credentials_hash['admin'],
aem_id => $aem_id,
ensure => stopped,
name => 'org.apache.sling.jcr.davex',
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,
Expand Down Expand Up @@ -406,6 +385,23 @@
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,
Expand Down