Skip to content

Commit f2a7f72

Browse files
try to add fqdns to inv file
1 parent bde1def commit f2a7f72

File tree

2 files changed

+21
-14
lines changed

2 files changed

+21
-14
lines changed

.github/workflows/test-replace-failed-postgresql.yaml

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,13 @@ jobs:
7979
echo ::group::info:inventory
8080
sed -e 's/password: .*/password: "[redacted]"/' < spec/fixtures/litmus_inventory.yaml || true
8181
echo ::endgroup::
82-
- name: Install PE on test cluster
83-
timeout-minutes: 120
84-
run: |
85-
bundle exec bolt plan run peadm_spec::install_test_cluster \
86-
--inventoryfile spec/fixtures/litmus_inventory.yaml \
82+
echo ::group::certnames
83+
bundle exec bolt plan run peadm_spec::add_inventory_hostnames \
84+
--inventory spec/fixtures/litmus_inventory.yaml \
8785
--modulepath spec/fixtures/modules \
88-
architecture=${{ matrix.install_architecture }} \
89-
version=${{ matrix.version }} \
90-
console_password=${{ secrets.CONSOLE_PASSWORD }} \
91-
code_manager_auto_configure=true
86+
--no-host-key-check \
87+
inventory_file=spec/fixtures/litmus_inventory.yaml
88+
echo ::endgroup::
9289
- name: Output contents of litmus_inventory.yaml
9390
run: |
9491
cat spec/fixtures/litmus_inventory.yaml
@@ -110,6 +107,16 @@ jobs:
110107
failed_postgresql_host=$(yq '.groups[].targets[] | select(.vars.role == "primary-pdb-postgresql") | .uri' spec/fixtures/litmus_inventory.yaml) \
111108
replacement_postgresql_host=$(yq '.groups[].targets[] | select(.vars.role == "spare-replica") | .uri' spec/fixtures/litmus_inventory.yaml) \
112109
--no-host-key-check
110+
- name: Install PE on test cluster
111+
timeout-minutes: 120
112+
run: |
113+
bundle exec bolt plan run peadm_spec::install_test_cluster \
114+
--inventoryfile spec/fixtures/litmus_inventory.yaml \
115+
--modulepath spec/fixtures/modules \
116+
architecture=${{ matrix.install_architecture }} \
117+
version=${{ matrix.version }} \
118+
console_password=${{ secrets.CONSOLE_PASSWORD }} \
119+
code_manager_auto_configure=true
113120
- name: Tear down PE XL DR test cluster
114121
if: ${{ always() }}
115122
continue-on-error: true

spec/acceptance/peadm_spec/plans/test_replace_failed_postgres.pp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
out::message("Replacement PostgreSQL host: ${replacement_postgresql_host}, fqdn: ${replacement_postgres_fqdn}")
3131

3232
run_plan('peadm::replace_failed_postgresql',
33-
primary_host => $primary_host,
34-
replica_host => $replica_host,
35-
working_postgresql_host => $working_postgresql_host,
36-
failed_postgresql_host => $failed_postgresql_host,
37-
replacement_postgresql_host => $replacement_postgresql_host,
33+
primary_host => $primary_fqdn,
34+
replica_host => $replica_fqdn,
35+
working_postgresql_host => $working_postgres_fqdn,
36+
failed_postgresql_host => $failed_postgres_fqdn,
37+
replacement_postgresql_host => $replacement_postgres_fqdn,
3838
)
3939
}

0 commit comments

Comments
 (0)