Update lab

internet2 · Apr 20, 2018 · bfd1a63 · bfd1a63
1 parent 3ef9ab4
commit bfd1a63
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 144 deletions.
diff --git a/ansible.cfg b/ansible.cfg
@@ -1,8 +1,8 @@
 [defaults]
 roles_path = /srv/ansible/roles
 host_key_checking = False
-library = /srv/ansible/lib/python3.5/site-packages/napalm_ansible-0.9.1-py3.5.egg/napalm_ansible/modules
-action_plugins = /srv/ansible/lib/python3.5/site-packages/napalm_ansible-0.9.1-py3.5.egg/napalm_ansible/plugins/action
+library = /srv/nslab-ansible/local/lib/python2.7/site-packages/napalm_ansible/modules
+action_plugins = /srv/nslab-ansible/local/lib/python2.7/site-packages/napalm_ansible/plugins/action
 
 [persistent_connection]
 command_timeout=100

diff --git a/core-deploy.retry b/core-deploy.retry
@@ -1,4 +1,3 @@
 ansible-vmx1
 ansible-vmx2
 ansible-vmx3
-ansible-vmx4
diff --git a/core-deploy.yml b/core-deploy.yml
@@ -13,11 +13,18 @@
 ## Second Play
 - name: Generate Configuration for all routers
   gather_facts: no
-  connection: local
+#  connection: local
   hosts: all
   tags: [ template ]
   tasks:
     - include_vars: "./nodes.yml"
+    - name: Get facts for napalm_os_version
+      napalm_get_facts:
+        hostname: "{{ ansible_host }}"
+        username: "{{ ansible_user }}"
+        dev_os: "{{ ansible_network_os }}"
+        optional_args:
+          key_file: "{{ ansible_ssh_private_key_file }}"
     - name: create the directory for the configuration
       file: path=core_config  state=directory
       run_once: true
@@ -46,5 +53,6 @@
           key_file: "{{ ansible_ssh_private_key_file }}"
         config_file: core_config/{{inventory_hostname}}-config.txt
         commit_changes: "{{commit}}"
+        replace_config: "{{replace_config|default('0')}}"
         diff_file: diff/{{inventory_hostname}}-diff.txt
       when: "inventory_hostname in nodes.keys()"
diff --git a/core_config/ansible-vmx1-config.txt b/core_config/ansible-vmx1-config.txt
@@ -1,4 +1,5 @@
 
+version 15.1F6.9
 system {
     host-name ansible-vmx1;
     no-redirects;
@@ -75,7 +76,7 @@ interfaces {
         description "OOB to MGMT Network";
         unit 0 {
             family inet {
-                address 10.39.0.41/24;
+                address 10.39.0.41/20;
             }
         }
     }

diff --git a/core_config/ansible-vmx2-config.txt b/core_config/ansible-vmx2-config.txt
@@ -1,4 +1,5 @@
 
+version 15.1F6.9
 system {
     host-name ansible-vmx2;
     no-redirects;
@@ -62,7 +63,7 @@ interfaces {
         description "OOB to MGMT Network";
         unit 0 {
             family inet {
-                address 10.39.0.42/24;
+                address 10.39.0.42/20;
             }
         }
     }

diff --git a/core_config/ansible-vmx3-config.txt b/core_config/ansible-vmx3-config.txt
@@ -1,4 +1,5 @@
 
+version 15.1F6.9
 system {
     host-name ansible-vmx3;
     no-redirects;
@@ -62,7 +63,7 @@ interfaces {
         description "OOB to MGMT Network";
         unit 0 {
             family inet {
-                address 10.39.0.43/24;
+                address 10.39.0.43/20;
             }
         }
     }

diff --git a/core_config/ansible-vmx4-config.txt b/core_config/ansible-vmx4-config.txt
diff --git a/diff/ansible-vmx1-diff.txt b/diff/ansible-vmx1-diff.txt
diff --git a/diff/ansible-vmx2-diff.txt b/diff/ansible-vmx2-diff.txt
diff --git a/diff/ansible-vmx3-diff.txt b/diff/ansible-vmx3-diff.txt
diff --git a/facts_napalm.retry b/facts_napalm.retry
@@ -0,0 +1,3 @@
+ansible-vmx1
+ansible-vmx2
+ansible-vmx3
diff --git a/facts_napalm.yml b/facts_napalm.yml
@@ -15,4 +15,5 @@
       register: results
 
     - name: Display facts
-      debug: var=results
+      debug: 
+        var: "napalm_os_version"
diff --git a/junos/core.j2 b/junos/core.j2
@@ -5,6 +5,7 @@
 ###         System configuration            ######
 **************************************************
     #}
+version {{napalm_os_version}}
 system {
     host-name {{inventory_hostname}};
     no-redirects;