From 800453513a3f3e3f77ba698b77a76b90848fa6d4 Mon Sep 17 00:00:00 2001
From: Aleksandr Kurbatov <ak@geant.org>
Date: Wed, 4 Dec 2024 15:06:50 +0000
Subject: [PATCH 1/3] p-to-pe command_checks: add conditional for displaying
results
---
.../gap_ansible/roles/promote_p_to_pe/tasks/command_checks.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/tasks/command_checks.yaml b/geant/gap_ansible/roles/promote_p_to_pe/tasks/command_checks.yaml
index 4d95f8c4..8d3f40bb 100644
--- a/geant/gap_ansible/roles/promote_p_to_pe/tasks/command_checks.yaml
+++ b/geant/gap_ansible/roles/promote_p_to_pe/tasks/command_checks.yaml
@@ -6,5 +6,6 @@
display: json
register: out
- name: "Results of {{ item.command }}"
+ when: out.output['rpc-reply']['nokiaoper:results'] != None
ansible.builtin.debug:
msg: "{{out.output['rpc-reply']['nokiaoper:results']['nokiaoper:md-cli-output-block'].split('\n')}}"
--
GitLab
From 3d3f6b6d10a5f2d5c51b480a04c2c67cc3d462b9 Mon Sep 17 00:00:00 2001
From: Aleksandr Kurbatov <ak@geant.org>
Date: Wed, 4 Dec 2024 17:04:04 +0000
Subject: [PATCH 2/3] p_to_pe: update in command checks
---
.../gap_ansible/roles/promote_p_to_pe/tasks/command_checks.yaml | 2 +-
geant/gap_ansible/roles/promote_p_to_pe/tasks/main.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/tasks/command_checks.yaml b/geant/gap_ansible/roles/promote_p_to_pe/tasks/command_checks.yaml
index 8d3f40bb..06ad86e9 100644
--- a/geant/gap_ansible/roles/promote_p_to_pe/tasks/command_checks.yaml
+++ b/geant/gap_ansible/roles/promote_p_to_pe/tasks/command_checks.yaml
@@ -6,6 +6,6 @@
display: json
register: out
- name: "Results of {{ item.command }}"
- when: out.output['rpc-reply']['nokiaoper:results'] != None
+ when: "'nokiaoper:results' in out.output['rpc-reply']"
ansible.builtin.debug:
msg: "{{out.output['rpc-reply']['nokiaoper:results']['nokiaoper:md-cli-output-block'].split('\n')}}"
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/tasks/main.yml b/geant/gap_ansible/roles/promote_p_to_pe/tasks/main.yml
index 16eabc11..4a68aacc 100644
--- a/geant/gap_ansible/roles/promote_p_to_pe/tasks/main.yml
+++ b/geant/gap_ansible/roles/promote_p_to_pe/tasks/main.yml
@@ -57,7 +57,7 @@
ansible.builtin.include_tasks: deploy.yaml
- name: PRE checks
- when: verb == "post_checks"
+ when: verb == "pre_checks"
ansible.builtin.include_tasks: command_checks.yaml
loop: "{{ pre_check_commands }}"
--
GitLab
From 763b3aaace62e378eb19abba5b51b0ffe4f66364 Mon Sep 17 00:00:00 2001
From: Aleksandr Kurbatov <ak@geant.org>
Date: Wed, 4 Dec 2024 17:05:59 +0000
Subject: [PATCH 3/3] v1.1.20
---
geant/gap_ansible/CHANGELOG.md | 3 +++
geant/gap_ansible/galaxy.yml | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/geant/gap_ansible/CHANGELOG.md b/geant/gap_ansible/CHANGELOG.md
index 13e8e952..e3a3177e 100644
--- a/geant/gap_ansible/CHANGELOG.md
+++ b/geant/gap_ansible/CHANGELOG.md
@@ -1,4 +1,7 @@
# GAP Ansible changelog
+1.1.20 2024-12-04
+- Bugfixes in `p_to_pe_promotion` pre and post checks
+
1.1.19 2024-12-03
- Added a list of roles for L3 service provisioning.
- `sbp` - SBP interface configuration
diff --git a/geant/gap_ansible/galaxy.yml b/geant/gap_ansible/galaxy.yml
index 926db354..f2e294b5 100644
--- a/geant/gap_ansible/galaxy.yml
+++ b/geant/gap_ansible/galaxy.yml
@@ -8,7 +8,7 @@ namespace: geant
name: gap_ansible
# The version of the collection. Must be compatible with semantic versioning
-version: 1.1.19
+version: 1.1.20
# The path to the Markdown (.md) readme file. This path is relative to the root of the collection
readme: README.md
--
GitLab