Merge pull request #63 from enix/haproxy_migration_dry_run_fix

Fix dry-run of haproxy migration path
enix · Dec 13, 2023 · 01bc83b · 01bc83b
2 parents 24093b6 + dd0becd
commit 01bc83b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/roles/apiserver_haproxy_upgrade/tasks/main.yml b/roles/apiserver_haproxy_upgrade/tasks/main.yml
@@ -18,6 +18,7 @@
     service:
       name: haproxy
       state: reloaded
+    when: not(_haproxy_repo_just_added is changed and ansible_check_mode)
 
   rescue:
   - name: "Restart compose stack if error occured"

diff --git a/tests/features/haproxy.feature b/tests/features/haproxy.feature
@@ -35,6 +35,7 @@ Feature: Haproxy
         When With those group_vars on group all:
             apiserver_proxy_use_docker: false
         When I reset tasks counters
+        When I dry-run the playbooks 00_apiserver_proxy.yml
         When I run the playbooks 00_apiserver_proxy.yml
                                  01_site.yml
         Then I should have a working cluster
diff --git a/tests/helpers/ansible.py b/tests/helpers/ansible.py
@@ -1,5 +1,6 @@
 import itertools
 import os
+import re
 
 import ansible_runner
 
@@ -56,5 +57,6 @@ def run_ansible_playbook(
 
 def assert_ansible_error(run):
     assert run.status == "successful"
+    assert len(re.findall(r".*fatal: .*", run.stdout.read())) == 0
     for host_failed, number_failed in run.stats.get("failures", {}).items():
         assert number_failed == 0