From b43805d70d225db1f1e9cb70b08119b989df5ce2 Mon Sep 17 00:00:00 2001
From: Simone Spinelli <simone.spinelli@geant.org>
Date: Mon, 15 May 2023 13:23:55 +0000
Subject: [PATCH] Add iptrunk_checks playbook and resolv some Ansible warnings
---
iptrunks_checks.yaml | 8 ++++++++
roles/base_config/tasks/main.yml | 4 ++--
roles/iptrunks/vars/main.yml | 8 ++++----
3 files changed, 14 insertions(+), 6 deletions(-)
create mode 100644 iptrunks_checks.yaml
diff --git a/iptrunks_checks.yaml b/iptrunks_checks.yaml
new file mode 100644
index 00000000..fb0dd600
--- /dev/null
+++ b/iptrunks_checks.yaml
@@ -0,0 +1,8 @@
+- name: Manage iptrunks checks playbook
+ hosts: all
+ remote_user: admin
+ vars_files:
+ - /opt/ansible_inventory/group_vars/junos/device_access.yaml
+ roles:
+ - Juniper.junos
+ - roles/iptrunks
diff --git a/roles/base_config/tasks/main.yml b/roles/base_config/tasks/main.yml
index 2a9471d4..b3f6bf06 100644
--- a/roles/base_config/tasks/main.yml
+++ b/roles/base_config/tasks/main.yml
@@ -25,9 +25,9 @@
debug:
msg: "{{opid}}"
-- include: compile_base_config.yaml
+- include_tasks: compile_base_config.yaml
when: verb in verbs
-- include: deploy_base_config.yaml
+- include_tasks: deploy_base_config.yaml
when: verb == "deploy"
diff --git a/roles/iptrunks/vars/main.yml b/roles/iptrunks/vars/main.yml
index df840cd7..d801e71f 100644
--- a/roles/iptrunks/vars/main.yml
+++ b/roles/iptrunks/vars/main.yml
@@ -19,10 +19,10 @@ config_objects:
wfo_trunk: "{{wfo_trunk_json}}"
config_object: "{{object}}"
-side_a_ipv4_address: "{{ wfo_trunk.iptrunk.iptrunk_ipv4_network| ipaddr('net') | ipaddr('address')}}/31"
-side_a_ipv6_address: "{{ wfo_trunk.iptrunk.iptrunk_ipv6_network| ipaddr('net') | ipaddr('1') | ipaddr('address')}}/126"
-side_b_ipv4_address: "{{ wfo_trunk.iptrunk.iptrunk_ipv4_network| ipaddr('net') | ipaddr('1') | ipaddr('address')}}/31"
-side_b_ipv6_address: "{{ wfo_trunk.iptrunk.iptrunk_ipv6_network| ipaddr('net') | ipaddr('2') | ipaddr('address')}}/126"
+side_a_ipv4_address: "{{ wfo_trunk.iptrunk.iptrunk_ipv4_network| ansible.utils.ipaddr('net') | ansible.utils.ipaddr('address')}}/31"
+side_a_ipv6_address: "{{ wfo_trunk.iptrunk.iptrunk_ipv6_network| ansible.utils.ipaddr('net') | ansible.utils.ipaddr('1') | ansible.utils.ipaddr('address')}}/126"
+side_b_ipv4_address: "{{ wfo_trunk.iptrunk.iptrunk_ipv4_network| ansible.utils.ipaddr('net') | ansible.utils.ipaddr('1') | ansible.utils.ipaddr('address')}}/31"
+side_b_ipv6_address: "{{ wfo_trunk.iptrunk.iptrunk_ipv6_network| ansible.utils.ipaddr('net') | ansible.utils.ipaddr('2') | ansible.utils.ipaddr('address')}}/126"
trunks:
--
GitLab