From fa1fa67497d2a95eddf26cf42bc50ef03d9b0a1e Mon Sep 17 00:00:00 2001
From: Lee Van Ginkel <65776483+lvangink@users.noreply.github.com>
Date: Wed, 10 Jan 2024 09:39:17 -0800
Subject: [PATCH 1/5] Update netbox.yml

Receiving SSL error between Netbox and Ansible when running container in CI. Setting validate certs to off here seems to fix it.
---
 roles/data/tasks/netbox.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/data/tasks/netbox.yml b/roles/data/tasks/netbox.yml
index 9f3ec35..8a67078 100644
--- a/roles/data/tasks/netbox.yml
+++ b/roles/data/tasks/netbox.yml
@@ -2,4 +2,4 @@
   set_fact:
     mdd_data: "{{ mdd_data | default({}) | ciscops.mdd.mdd_combine(oc_data, recursive=True) }}"
   vars:
-    oc_data: "{{ query('ciscops.mdd.netbox_oc', inventory_hostname) }}"
\ No newline at end of file
+    oc_data: "{{ query('ciscops.mdd.netbox_oc', inventory_hostname, validate_certs=False) }}"

From 4de3e89d598093e0c0a980fb8ba569608b482ded Mon Sep 17 00:00:00 2001
From: Lee Van Ginkel <65776483+lvangink@users.noreply.github.com>
Date: Wed, 10 Jan 2024 12:51:32 -0800
Subject: [PATCH 2/5] Update nso_harvest_native.yml

Updating playbook to include netbox role
---
 playbooks/nso_harvest_native.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/playbooks/nso_harvest_native.yml b/playbooks/nso_harvest_native.yml
index 07f9a86..cfb40cd 100644
--- a/playbooks/nso_harvest_native.yml
+++ b/playbooks/nso_harvest_native.yml
@@ -5,6 +5,7 @@
   roles:
     - ciscops.mdd.data
     - ciscops.mdd.nso
+    - ciscops.mdd.netbox
   tasks:
 
     - name: Harvest Native Config

From c82a9cc6994f06d710c45a88609d4de5e8bd96e5 Mon Sep 17 00:00:00 2001
From: Lee Van Ginkel <65776483+lvangink@users.noreply.github.com>
Date: Wed, 10 Jan 2024 12:52:33 -0800
Subject: [PATCH 3/5] Update netbox.yml

updating data task to pull validate certs from netbox role.
---
 roles/data/tasks/netbox.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/data/tasks/netbox.yml b/roles/data/tasks/netbox.yml
index 8a67078..22c31f5 100644
--- a/roles/data/tasks/netbox.yml
+++ b/roles/data/tasks/netbox.yml
@@ -2,4 +2,4 @@
   set_fact:
     mdd_data: "{{ mdd_data | default({}) | ciscops.mdd.mdd_combine(oc_data, recursive=True) }}"
   vars:
-    oc_data: "{{ query('ciscops.mdd.netbox_oc', inventory_hostname, validate_certs=False) }}"
+    oc_data: "{{ query('ciscops.mdd.netbox_oc', inventory_hostname, validate_certs=netbox_validate_certs) }}"

From c45132cf4a59288618e4cc04ba69409b9f7eac6a Mon Sep 17 00:00:00 2001
From: Jason King <jk1ng@yahoo.com>
Date: Wed, 10 Jan 2024 13:09:48 -0800
Subject: [PATCH 4/5] Cleaned up include netbox role

---
 playbooks/nso_harvest_native.yml | 1 -
 roles/data/tasks/main.yml        | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/playbooks/nso_harvest_native.yml b/playbooks/nso_harvest_native.yml
index cfb40cd..07f9a86 100644
--- a/playbooks/nso_harvest_native.yml
+++ b/playbooks/nso_harvest_native.yml
@@ -5,7 +5,6 @@
   roles:
     - ciscops.mdd.data
     - ciscops.mdd.nso
-    - ciscops.mdd.netbox
   tasks:
 
     - name: Harvest Native Config
diff --git a/roles/data/tasks/main.yml b/roles/data/tasks/main.yml
index c37c1ff..a7d2260 100644
--- a/roles/data/tasks/main.yml
+++ b/roles/data/tasks/main.yml
@@ -12,5 +12,7 @@
   set_fact:
     mdd_data: "{{ mdd_combine_output.mdd_data | default({}) }}"
 
-- include_tasks: netbox.yml 
+- block:
+  - include_role: ciscops.mdd.netbox
+  - include_tasks: netbox.yml
   when: netbox_api is defined or lookup('env', 'NETBOX_API', default=false)

From 2069950c4424cca3a7fe9581735209d4189511ae Mon Sep 17 00:00:00 2001
From: Jason King <jk1ng@yahoo.com>
Date: Wed, 10 Jan 2024 14:00:46 -0800
Subject: [PATCH 5/5] Fixing syntax error

---
 roles/data/tasks/main.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/roles/data/tasks/main.yml b/roles/data/tasks/main.yml
index a7d2260..966f1f2 100644
--- a/roles/data/tasks/main.yml
+++ b/roles/data/tasks/main.yml
@@ -13,6 +13,7 @@
     mdd_data: "{{ mdd_combine_output.mdd_data | default({}) }}"
 
 - block:
-  - include_role: ciscops.mdd.netbox
+  - include_role: 
+      name: ciscops.mdd.netbox
   - include_tasks: netbox.yml
   when: netbox_api is defined or lookup('env', 'NETBOX_API', default=false)