From 848c08511b6da963d00cfbaf5f10eb894f965a68 Mon Sep 17 00:00:00 2001
From: Milos Zdravkovic <zmilos85@gmail.com>
Date: Fri, 8 Nov 2024 14:12:19 +0100
Subject: [PATCH] Quick fix before review

---
 .../roles/deploy_service_config/defaults/main.yml         | 2 --
 .../roles/deploy_service_config/handlers/main.yml         | 2 --
 .../roles/deploy_service_config/tasks/main.yml            | 4 ++--
 .../roles/deploy_service_config/tasks/push_config.yml     | 8 ++++----
 .../gap_ansible/roles/deploy_service_config/vars/main.yml | 2 ++
 5 files changed, 8 insertions(+), 10 deletions(-)
 delete mode 100644 geant/gap_ansible/roles/deploy_service_config/defaults/main.yml
 delete mode 100644 geant/gap_ansible/roles/deploy_service_config/handlers/main.yml

diff --git a/geant/gap_ansible/roles/deploy_service_config/defaults/main.yml b/geant/gap_ansible/roles/deploy_service_config/defaults/main.yml
deleted file mode 100644
index 224547ba..00000000
--- a/geant/gap_ansible/roles/deploy_service_config/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# defaults file for deploy_service_config
diff --git a/geant/gap_ansible/roles/deploy_service_config/handlers/main.yml b/geant/gap_ansible/roles/deploy_service_config/handlers/main.yml
deleted file mode 100644
index f5d286b3..00000000
--- a/geant/gap_ansible/roles/deploy_service_config/handlers/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# handlers file for deploy_service_config
diff --git a/geant/gap_ansible/roles/deploy_service_config/tasks/main.yml b/geant/gap_ansible/roles/deploy_service_config/tasks/main.yml
index c6e24e01..3de81268 100644
--- a/geant/gap_ansible/roles/deploy_service_config/tasks/main.yml
+++ b/geant/gap_ansible/roles/deploy_service_config/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 
-- name: Fetch the access port info from the subscription   
+- name: Fetch access port info from the subscription   
   ansible.builtin.include_tasks: traverse_subscription.yml
 
 # The "delegate_to" works as expected in conjuction with "import_tasks"
@@ -22,7 +22,7 @@
 #        name: deploy_service_config
 #     when: verb == deploy  
 #
-- name: Push the assembled config to device
+- name: Push assembled config to device
   ansible.builtin.include_tasks: push_config.yml
 
 
diff --git a/geant/gap_ansible/roles/deploy_service_config/tasks/push_config.yml b/geant/gap_ansible/roles/deploy_service_config/tasks/push_config.yml
index d5c240a9..ddaa22ea 100644
--- a/geant/gap_ansible/roles/deploy_service_config/tasks/push_config.yml
+++ b/geant/gap_ansible/roles/deploy_service_config/tasks/push_config.yml
@@ -1,5 +1,5 @@
 
-- name: SBP ["{{ verb }}"] on "{{ inventory_hostname }}" [CHECK ONLY][NOKIA]
+- name: 'Config deploy [CHECK ONLY][NOKIA]'
   # ansible.netcommon.netconf_config:
   geant.gap_ansible.nokia_netconf_config:
     format: xml
@@ -7,7 +7,7 @@
     content: "/var/tmp/ansible_run_{{ opid }}/assembled/for_deployment"
     commit: true
     validate: true
-    config_mode: private
+    #config_mode: private ; CHANGELOG.md suggests this is implicit now?
   diff: true
   register: output
   check_mode: true
@@ -23,7 +23,7 @@
     and
     is_verification_workflow | ansible.builtin.bool
 
-- name: SBP ["{{ verb }}"] on "{{ inventory_hostname }}" [AND COMMIT][NOKIA]
+- name: 'Config deploy [AND COMMIT][NOKIA]'
   # ansible.netcommon.netconf_config:
   geant.gap_ansible.nokia_netconf_config:
     format: xml
@@ -31,7 +31,7 @@
     content: "/var/tmp/ansible_run_{{ opid }}/assembled/for_deployment"
     commit: true
     commit_comment: "{{ commit_comment }}"
-    config_mode: private
+    #config_mode: private ; CHANGELOG.md suggests this is implicit now?
   diff: true
   check_mode: false
   when: >
diff --git a/geant/gap_ansible/roles/deploy_service_config/vars/main.yml b/geant/gap_ansible/roles/deploy_service_config/vars/main.yml
index 0a9af9d9..bf5a91de 100644
--- a/geant/gap_ansible/roles/deploy_service_config/vars/main.yml
+++ b/geant/gap_ansible/roles/deploy_service_config/vars/main.yml
@@ -1,2 +1,4 @@
 ---
 # vars file for deploy_service_config
+dry_run: true
+is_verification_workflow: false
-- 
GitLab