Merge branch 'master' of https://github.com/hefayed/vxlan-evpn

Author: contiv

.remote-sync.json

@@ -0,0 +1,19 @@
+{
+  "logger": {
+    "title": "Remote Sync"
+  },
+  "uploadOnSave": true,
+  "useAtomicWrites": false,
+  "deleteLocal": true,
+  "port": "22",
+  "target": "vxlan-evpn",
+  "ignore": [
+    ".remote-sync.json",
+    ".git/**"
+  ],
+  "username": "contiv",
+  "password": "C1sc0123!",
+  "watch": [],
+  "transport": "scp",
+  "hostname": "10.2.6.149"
+}

BGW.yml

@@ -0,0 +1,6 @@
+---
+#Task 1: Build the Underlay for all Leafs
+- hosts: BGW
+  connection: local
+  roles:
+  - BGW

ISN.yml

@@ -0,0 +1,6 @@
+---
+#Task 1: Build the Underlay for all Leafs
+- hosts: ISN
+  connection: local
+  roles:
+  - ISN

access_ports.yml

@@ -0,0 +1,21 @@
+---
+#Task 1: Build the Underlay for all spines
+- hosts: leafs
+  connection: network_cli
+  vars:
+    nxos_provider:
+      username: "{{ user }}"
+      password: "{{ pwd }}"
+      transport: cli
+      host: "{{ hostvars[inventory_hostname].ansible_host }}"
+
+  tasks:
+
+    - name: ENSURE port is configured as access port
+      nxos_l2_interface:
+        provider: "{{ nxos_provider}}"
+        name: "{{ item.name }}"
+        mode: access
+        access_vlan: "{{ item.access_vlan }}"
+      with_items:
+          - { name: "Ethernet1/3", access_vlan: 103 }

csv_to_yml.py

@@ -0,0 +1,29 @@
+#!/usr/bin/env python
+import sys
+import csv
+import yaml
+import yamlloader
+
+l2vni_data = []
+my_csv_file = '/home/contiv/vxlan-evpn/l2vni_vars.csv'
+my_vars_file = '/home/contiv/vxlan-evpn/roles/l2vni_overlay/vars/main.yml'
+
+with open(my_csv_file, mode='r') as csvfile:
+    reader = csv.DictReader(csvfile)
+    for row in reader:
+        l2vni_data.append(row)
+
+with open(my_vars_file) as data:
+    data_loaded = yaml.load(data, Loader=yamlloader.ordereddict.CLoader)
+    yaml.dump(data_loaded, sys.stdout)
+
+with open(my_vars_file, "w") as file:
+    file.write('---\n')
+    yaml.dump({'nxos_provider': data_loaded['nxos_provider']}, file, Dumper=yamlloader.ordereddict.CDumper)
+    file.write('\n')
+    file.write('# vars for creation of l2vni and vlan interface configuration\n')
+
+
+with open(my_vars_file, "a") as file:
+    file.write('\n')
+    yaml.dump({'l2vni': l2vni_data}, file, Dumper=yamlloader.ordereddict.CDumper)

facts_module.retry

@@ -20,5 +20,5 @@
 
       - name: switch ports qty
         set_fact:
-          ports: "{{ module[0].ports }}"
-      - debug: var=ports
+          ports: "{{ vlan_list }}"
+      - debug: var=vlan_list

facts_module.yml

@@ -15,10 +15,25 @@ pwd=C1sc0123!
 gather_fact=no
 
 [leafs]
-leaf103 ansible_host=10.2.6.147 lo0_ipaddr=100.64.0.103 lo1_ipaddr=100.64.1.103 hostname=leaf103
-leaf101 ansible_host=10.2.6.146 lo0_ipaddr=100.64.0.101 lo1_ipaddr=100.64.1.101 hostname=leaf101
-leaf102 ansible_host=10.2.6.145 lo0_ipaddr=100.64.0.102 lo1_ipaddr=100.64.1.102 hostname=leaf102
+Leaf101 ansible_host=10.2.28.101 lo0_ipaddr=100.64.0.101 lo1_ipaddr=100.64.1.101 hostname=Leaf101
+Leaf102 ansible_host=10.2.28.102 lo0_ipaddr=100.64.0.102 lo1_ipaddr=100.64.1.102 hostname=Leaf102
+Leaf105 ansible_host=10.2.28.105 lo0_ipaddr=100.64.0.105 lo1_ipaddr=100.64.1.105 hostname=Leaf105
+Leaf106 ansible_host=10.2.28.106 lo0_ipaddr=100.64.0.106 lo1_ipaddr=100.64.1.106 hostname=Leaf106
+
 
 [spines]
-spine201 ansible_host=10.2.6.144 lo0_ipaddr=100.64.0.201 lo1_ipaddr=100.64.1.201 hostname=spine201
-spine202 ansible_host=10.2.6.143 lo0_ipaddr=100.64.0.202 lo1_ipaddr=100.64.1.202 hostname=spine202
+Spine201 ansible_host=10.2.28.201 lo0_ipaddr=100.64.0.201 lo1_ipaddr=100.64.1.201 hostname=Spine201
+Spine202 ansible_host=10.2.28.202 lo0_ipaddr=100.64.0.202 lo1_ipaddr=100.64.1.202 hostname=Spine202
+Spine203 ansible_host=10.2.28.203 lo0_ipaddr=100.64.0.203 lo1_ipaddr=100.64.1.203 hostname=Spine203
+Spine204 ansible_host=10.2.28.204 lo0_ipaddr=100.64.0.204 lo1_ipaddr=100.64.1.204 hostname=Spine204
+
+
+[ISN]
+ISN-1 ansible_host=10.2.28.111 lo0_ipaddr=100.64.0.111 lo1_ipaddr=100.64.1.111 ISN1_To_ISN2=100.64.254.101 hostname=ISN-1
+ISN-2 ansible_host=10.2.28.122 lo0_ipaddr=100.64.0.122 lo1_ipaddr=100.64.1.122 ISN2_To_ISN1=100.64.254.102 hostname=ISN-2
+
+[BGW]
+BGW-1 ansible_host=10.2.28.103 lo0_ipaddr=100.64.0.103 lo1_ipaddr=100.64.1.103 lo2_ipaddr=100.64.2.103 lo100_ipaddr=100.64.100.103 site_id=1 BGW_To_ISN=100.64.254.13 ISN_To_BGW=100.64.254.14 hostname=BGW-1
+BGW-2 ansible_host=10.2.28.104 lo0_ipaddr=100.64.0.104 lo1_ipaddr=100.64.1.104 lo2_ipaddr=100.64.2.104 lo100_ipaddr=100.64.100.104 site_id=1 BGW_To_ISN=100.64.254.21 ISN_To_BGW=100.64.254.22 h2stname=BGW-2
+BGW-3 ansible_host=10.2.28.107 lo0_ipaddr=100.64.0.107 lo1_ipaddr=100.64.1.107 lo2_ipaddr=100.64.2.107 lo100_ipaddr=100.64.100.107 site_id=2 BGW_To_ISN=100.64.254.33 ISN_To_BGW=100.64.254.34 hostname=BGW-3
+BGW-4 ansible_host=10.2.28.108 lo0_ipaddr=100.64.0.108 lo1_ipaddr=100.64.1.108 lo2_ipaddr=100.64.2.108 lo100_ipaddr=100.64.100.104 site_id=2 BGW_To_ISN=100.64.254.41 ISN_To_BGW=100.64.254.42 hostname=BGW-4

hosts

@@ -1,58 +1,31 @@
----
-#Task 1: Configure uplinks to spines
-  - hosts: leafs
-    any_errors_fatal: yes
-    vars_prompt:
-        name: "confirmation"
-        prompt: "Did you execute the leaf_underlay playbook? Answer 'Yes' or 'No' "
-        default: "No"
-        private: no
-
-    vars:
-      nxos_provider:
-        username: "{{ user }}"
-        password: "{{ pwd }}"
-        transport: cli
-        host: "{{ hostvars[inventory_hostname].ansible_host }}"
-
-    tasks:
-
-      - name: Check Confirmation
-        fail: msg="Playbook run confirmation failed"
-        when: confirmation != "Yes"
-
-      - name: GATHER FACTS FOR Leaf "{{ inventory_hostname }}"
-        nxos_facts:
-          provider: "{{ nxos_provider }}"
-
-      - debug: var=ansible_net_neighbors
-
-      - name: create interface keys
-        set_fact:
-          interfaces: "{{ ansible_net_neighbors.keys() }}"
-      - debug: var=interfaces
-
-
-      - name: Configure uplink interfaces to spines
-        nxos_config:
-          provider: "{{ nxos_provider }}"
-          lines:
-            - no switchport
-            - mtu 9216
-            - medium p2p
-            - ip unnumbered loopback0
-            - ip ospf network point-to-point
-            - ip router ospf UNDERLAY area 0.0.0.0
-            - no shutdown
-          parents: interface {{ item }}
-          match: none
-        with_items: "{{ interfaces }}"
-        when: ansible_net_neighbors[item][0]["sysname"] is search("Spine")
-
-      - name: Ensure an interface has the proper description
-        nxos_interface:
-          provider: "{{ nxos_provider }}"
-          name: "{{ item }}"
-          description: 'Connected-to-{{ ansible_net_neighbors[item][0]["port"] }}-{{ ansible_net_neighbors[item][0]["sysname"] }} '
-        with_items: "{{ interfaces}}"
-        when: ansible_net_neighbors[item][0]["sysname"] is search("Spine")
+---
+#Task 1: Configure uplinks to spines
+  - hosts: all
+    vars:
+      nxos_provider:
+        username: "{{ user }}"
+        password: "{{ pwd }}"
+        transport: cli
+        host: "{{ hostvars[inventory_hostname].ansible_host }}"
+
+    tasks:
+
+      - name: GATHER FACTS FOR Leaf "{{ inventory_hostname }}"
+        nxos_facts:
+          provider: "{{ nxos_provider }}"
+
+      - debug: var=ansible_net_neighbors
+
+      - name: create interface keys
+        set_fact:
+          interfaces: "{{ ansible_net_neighbors.keys() }}"
+      - debug: var=interfaces
+
+
+      - name: Ensure an interface has the proper description
+        nxos_interface:
+          provider: "{{ nxos_provider }}"
+          name: "{{ item }}"
+          description: 'Connected-to-{{ ansible_net_neighbors[item][0]["port"] }}-{{ ansible_net_neighbors[item][0]["sysname"] }} '
+        with_items: "{{ interfaces}}"
+        when: ansible_net_neighbors[item][0]["sysname"] is search("Spine") or ansible_net_neighbors[item][0]["sysname"] is search("Leaf")

interface_description.retry

@@ -0,0 +1,6 @@
+---
+#Task Creation of L2VNI on leafs
+- hosts: leafs
+  connection: local
+  roles:
+  - l2vni_overlay

interface_description.yml

@@ -0,0 +1,2 @@
+vlan_id,name,ip_address,l2vni,vrf
+103,L2BD-103,192.168.103.254/24,44103, EVPN-L3-VNI-VLAN-1000

l2vni_overlay.yml

@@ -0,0 +1,6 @@
+---
+#Task Creation of L2VNI on leafs
+- hosts: leafs
+  connection: local
+  roles:
+  - l3vni_overlay

l2vni_vars.csv

@@ -3,49 +3,4 @@
 - hosts: leafs
   connection: local
   roles:
-  - leaf_underlay
-
-  vars:
-    nxos_provider:
-      username: "{{ user }}"
-      password: "{{ pwd }}"
-      transport: cli
-      host: "{{ hostvars[inventory_hostname].ansible_host }}"
-
-  tasks:
-
-    - name: GATHER FACTS FOR Leaf "{{ inventory_hostname }}"
-      nxos_facts:
-        provider: "{{ nxos_provider }}"
-
-    - debug: var=ansible_net_neighbors
-
-    - name: CREATE INTERFACE KEYS BASED ON CDP INFORMATION
-      set_fact:
-        interfaces: "{{ ansible_net_neighbors.keys() }}"
-    - debug: var=interfaces
-
-
-    - name: CONFIGURE UPLINK INTERFACES TO SPINES
-      nxos_config:
-        provider: "{{ nxos_provider }}"
-        lines:
-          - no switchport
-          - mtu 9216
-          - medium p2p
-          - ip unnumbered loopback0
-          - ip ospf network point-to-point
-          - ip router ospf UNDERLAY area 0.0.0.0
-          - no shutdown
-        parents: interface {{ item }}
-        match: none
-      with_items: "{{ interfaces }}"
-      when: ansible_net_neighbors[item][0]["sysname"] is search("Spine")
-
-    - name: CONFIGURE PROPER DISCRIPTION FOR UPLINKS TO LEAFS BASED ON CDP INFORMATION
-      nxos_interface:
-        provider: "{{ nxos_provider }}"
-        name: "{{ item }}"
-        description: 'Connected-to-{{ ansible_net_neighbors[item][0]["port"] }}-{{ ansible_net_neighbors[item][0]["sysname"] }} '
-      with_items: "{{ interfaces}}"
-      when: ansible_net_neighbors[item][0]["sysname"] is search("Spine")
+  - leaf_underlay