diff --git a/ansible/ansible.cfg b/ansible/ansible.cfg index 3b0443829c2..53dd6c5f0b3 100644 --- a/ansible/ansible.cfg +++ b/ansible/ansible.cfg @@ -1,7 +1,7 @@ # config file for ansible -- http://ansible.com/ # ============================================== -# nearly all parameters can be overridden in ansible-playbook +# nearly all parameters can be overridden in ansible-playbook # or with command line flags. ansible will read ANSIBLE_CONFIG, # ansible.cfg in the current working directory, .ansible.cfg in # the home directory or /etc/ansible/ansible.cfg, whichever it @@ -23,6 +23,7 @@ sudo_user = root transport = smart #remote_port = 22 module_lang = C +max_diff_size = 512000 # plays will gather facts by default, which contain information about # the remote system. @@ -73,22 +74,22 @@ log_path = $HOME/ansible.log # list any Jinja2 extensions to enable here: #jinja2_extensions = jinja2.ext.do,jinja2.ext.i18n -# if set, always use this private key file for authentication, same as +# if set, always use this private key file for authentication, same as # if passing --private-key to ansible or ansible-playbook #private_key_file = /path/to/file -# format of string {{ ansible_managed }} available within Jinja2 +# format of string {{ ansible_managed }} available within Jinja2 # templates indicates to users editing templates files will be replaced. # replacing {file}, {host} and {uid} and strftime codes with proper values. ansible_managed = Ansible managed: {file} modified on %Y-%m-%d %H:%M:%S by {uid} on {host} # by default, ansible-playbook will display "Skipping [host]" if it determines a task -# should not be run on a host. Set this to "False" if you don't want to see these "Skipping" -# messages. NOTE: the task header will still be shown regardless of whether or not the +# should not be run on a host. Set this to "False" if you don't want to see these "Skipping" +# messages. NOTE: the task header will still be shown regardless of whether or not the # task is skipped. #display_skipped_hosts = True -# by default (as of 1.3), Ansible will raise errors when attempting to dereference +# by default (as of 1.3), Ansible will raise errors when attempting to dereference # Jinja2 variables that are not set in templates or action lines. Uncomment this line # to revert the behavior to pre-1.3. #error_on_undefined_vars = False @@ -107,7 +108,7 @@ deprecation_warnings = False # (as of 1.8), Ansible can optionally warn when usage of the shell and # command module appear to be simplified by using a default Ansible module # instead. These warnings can be silenced by adjusting the following -# setting or adding warn=yes or warn=no to the end of the command line +# setting or adding warn=yes or warn=no to the end of the command line # parameter string. This will for example suggest using the git module # instead of shelling out to the git command. # command_warnings = False @@ -123,30 +124,30 @@ filter_plugins = plugins/filter callback_whitelist = profile_tasks # by default callbacks are not loaded for /bin/ansible, enable this if you -# want, for example, a notification or logging callback to also apply to +# want, for example, a notification or logging callback to also apply to # /bin/ansible runs #bin_ansible_callbacks = False # don't like cows? that's unfortunate. -# set to 1 if you don't want cowsay support or export ANSIBLE_NOCOWS=1 +# set to 1 if you don't want cowsay support or export ANSIBLE_NOCOWS=1 #nocows = 1 # don't like colors either? # set to 1 if you don't want colors, or export ANSIBLE_NOCOLOR=1 #nocolor = 1 -# the CA certificate path used for validating SSL certs. This path +# the CA certificate path used for validating SSL certs. This path # should exist on the controlling node, not the target nodes # common locations: # RHEL/CentOS: /etc/pki/tls/certs/ca-bundle.crt # Fedora : /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem # Ubuntu : /usr/share/ca-certificates/cacert.org/cacert.org.crt -#ca_file_path = +#ca_file_path = # the http user-agent string to use when fetching urls. Some web server # operators block the default urllib user agent as it is frequently used -# by malicious attacks/scripts, so we set it to something unique to +# by malicious attacks/scripts, so we set it to something unique to # avoid issues. #http_user_agent = ansible-agent @@ -184,33 +185,33 @@ become_method='sudo' [ssh_connection] # ssh arguments to use -# Leaving off ControlPersist will result in poor performance, so use +# Leaving off ControlPersist will result in poor performance, so use # paramiko on older platforms rather than removing it ssh_args = -o ControlMaster=auto -o ControlPersist=120s -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no # The path to use for the ControlPath sockets. This defaults to # "%(directory)s/ansible-ssh-%%h-%%p-%%r", however on some systems with -# very long hostnames or very long path names (caused by long user names or +# very long hostnames or very long path names (caused by long user names or # deeply nested home directories) this can exceed the character limit on -# file socket names (108 characters for most platforms). In that case, you +# file socket names (108 characters for most platforms). In that case, you # may wish to shorten the string below. -# -# Example: +# +# Example: # control_path = %(directory)s/%%h-%%r #control_path = %(directory)s/ansible-ssh-%%h-%%p-%%r -# Enabling pipelining reduces the number of SSH operations required to -# execute a module on the remote server. This can result in a significant -# performance improvement when enabled, however when using "sudo:" you must +# Enabling pipelining reduces the number of SSH operations required to +# execute a module on the remote server. This can result in a significant +# performance improvement when enabled, however when using "sudo:" you must # first disable 'requiretty' in /etc/sudoers # # By default, this option is disabled to preserve compatibility with # sudoers configurations that have requiretty (the default on many distros). -# +# pipelining = True -# if True, make ansible use scp if the connection type is ssh +# if True, make ansible use scp if the connection type is ssh # (default is sftp) #scp_if_ssh = True @@ -221,7 +222,7 @@ accelerate_connect_timeout = 5.0 # The daemon timeout is measured in minutes. This time is measured # from the last activity to the accelerate daemon. -accelerate_daemon_timeout = 30 +accelerate_daemon_timeout = 30 # If set to yes, accelerate_multi_key will allow multiple # private keys to be uploaded to it, though each user must diff --git a/ansible/minigraph/lab-a7260-01.t0-116.xml b/ansible/minigraph/lab-a7260-01.t0-116.xml index 8e4836fb9cb..ba260ef7349 100644 --- a/ansible/minigraph/lab-a7260-01.t0-116.xml +++ b/ansible/minigraph/lab-a7260-01.t0-116.xml @@ -220,7 +220,7 @@ Vlan1000 - Ethernet1/1;Ethernet1/3;Ethernet2/1;Ethernet2/3;Ethernet3/1;Ethernet3/3;Ethernet4/1;Ethernet4/3;Ethernet5/1;Ethernet5/3;Ethernet6/1;Ethernet6/3;Ethernet7/1;Ethernet7/3;Ethernet8/1;Ethernet8/3;Ethernet9/1;Ethernet9/3;Ethernet10/1;Ethernet10/3;Ethernet11/1;Ethernet11/3;Ethernet12/1;Ethernet12/3;Ethernet21/1;Ethernet21/3;Ethernet22/1;Ethernet22/3;Ethernet23/1;Ethernet23/3;Ethernet24/1;Ethernet24/3;Ethernet25/1;Ethernet25/3;Ethernet26/1;Ethernet26/3;Ethernet27/1;Ethernet27/3;Ethernet28/1;Ethernet28/3;Ethernet29/1;Ethernet29/3;Ethernet30/1;Ethernet30/3;Ethernet31/1;Ethernet31/3;Ethernet32/1;Ethernet32/3;Ethernet33/1;Ethernet33/3;Ethernet34/1;Ethernet34/3;Ethernet35/1;Ethernet35/3;Ethernet36/1;Ethernet36/3;Ethernet37/1;Ethernet37/3;Ethernet38/1;Ethernet38/3;Ethernet39/1;Ethernet39/3;Ethernet40/1;Ethernet40/3;Ethernet41/1;Ethernet41/3;Ethernet42/1;Ethernet42/3;Ethernet43/1;Ethernet43/3;Ethernet44/1;Ethernet44/3;Ethernet45/1;Ethernet45/3;Ethernet46/1;Ethernet46/3;Ethernet47/1;Ethernet47/3;Ethernet48/1;Ethernet48/3;Ethernet49/1;Ethernet49/3;Ethernet50/1;Ethernet50/3;Ethernet51/1;Ethernet51/3;Ethernet52/1;Ethernet52/3;Ethernet53/1;Ethernet53/3;Ethernet54/1;Ethernet54/3;Ethernet55/1;Ethernet55/3;Ethernet56/1;Ethernet56/3;Ethernet57/1;Ethernet57/3;Ethernet58/1;Ethernet58/3;Ethernet59/1;Ethernet59/3;Ethernet60/1;Ethernet60/3;Ethernet61/1;Ethernet61/3;Ethernet62/1;Ethernet62/3;Ethernet63/1;Ethernet63/3;Ethernet64/1;Ethernet64/3 + Ethernet1/1;Ethernet1/3;Ethernet2/1;Ethernet2/3;Ethernet3/1;Ethernet3/3;Ethernet4/1;Ethernet4/3;Ethernet5/1;Ethernet5/3;Ethernet6/1;Ethernet6/3;Ethernet7/1;Ethernet7/3;Ethernet8/1;Ethernet8/3;Ethernet9/1;Ethernet9/3;Ethernet10/1;Ethernet10/3;Ethernet11/1;Ethernet11/3;Ethernet12/1;Ethernet12/3;Ethernet21/1;Ethernet21/3;Ethernet22/1;Ethernet22/3;Ethernet23/1;Ethernet23/3;Ethernet24/1;Ethernet24/3;Ethernet25/1;Ethernet25/3;Ethernet26/1;Ethernet26/3;Ethernet27/1;Ethernet27/3;Ethernet28/1;Ethernet28/3;Ethernet29/1;Ethernet29/3;Ethernet30/1;Ethernet30/3;Ethernet31/1;Ethernet31/3;Ethernet32/1;Ethernet32/3;Ethernet33/1;Ethernet33/3;Ethernet34/1;Ethernet34/3;Ethernet35/1;Ethernet35/3;Ethernet36/1;Ethernet36/3;Ethernet37/1;Ethernet37/3;Ethernet38/1;Ethernet38/3;Ethernet39/1;Ethernet39/3;Ethernet40/1;Ethernet40/3;Ethernet41/1;Ethernet41/3;Ethernet42/1;Ethernet42/3;Ethernet43/1;Ethernet43/3;Ethernet44/1;Ethernet44/3;Ethernet45/1;Ethernet45/3;Ethernet46/1;Ethernet46/3;Ethernet47/1;Ethernet47/3;Ethernet48/1;Ethernet48/3;Ethernet49/1;Ethernet49/3;Ethernet50/1;Ethernet50/3;Ethernet51/1;Ethernet51/3;Ethernet52/1;Ethernet52/3;Ethernet53/1;Ethernet53/3;Ethernet54/1;Ethernet54/3;Ethernet55/1;Ethernet55/3;Ethernet56/1;Ethernet56/3;Ethernet57/1;Ethernet57/3;Ethernet58/1;Ethernet58/3;Ethernet59/1;Ethernet59/3;Ethernet60/1;Ethernet60/3;Ethernet61/1;Ethernet61/3;Ethernet62/1;Ethernet62/3;Ethernet63/1;Ethernet63/3;Ethernet64/1;Ethernet64/3 False 0.0.0.0/0 @@ -289,7 +289,12 @@ Everflow Everflow - + + ERSPANV6 + EverflowV6 + EverflowV6 + + VTY_LINE ssh-only SSH @@ -2778,9 +2783,9 @@ true 0 - Arista-7260CX3-D108C8 + Arista-7260CX3-D108C8 - + diff --git a/ansible/minigraph/lab-s6000-01.t0.xml b/ansible/minigraph/lab-s6000-01.t0.xml index 81dea7bc5eb..5301c5d8f3e 100644 --- a/ansible/minigraph/lab-s6000-01.t0.xml +++ b/ansible/minigraph/lab-s6000-01.t0.xml @@ -220,7 +220,7 @@ Vlan1000 - fortyGigE0/4;fortyGigE0/8;fortyGigE0/12;fortyGigE0/16;fortyGigE0/20;fortyGigE0/24;fortyGigE0/28;fortyGigE0/32;fortyGigE0/36;fortyGigE0/40;fortyGigE0/44;fortyGigE0/48;fortyGigE0/52;fortyGigE0/56;fortyGigE0/60;fortyGigE0/64;fortyGigE0/68;fortyGigE0/72;fortyGigE0/76;fortyGigE0/80;fortyGigE0/84;fortyGigE0/88;fortyGigE0/92;fortyGigE0/96 + fortyGigE0/4;fortyGigE0/8;fortyGigE0/12;fortyGigE0/16;fortyGigE0/20;fortyGigE0/24;fortyGigE0/28;fortyGigE0/32;fortyGigE0/36;fortyGigE0/40;fortyGigE0/44;fortyGigE0/48;fortyGigE0/52;fortyGigE0/56;fortyGigE0/60;fortyGigE0/64;fortyGigE0/68;fortyGigE0/72;fortyGigE0/76;fortyGigE0/80;fortyGigE0/84;fortyGigE0/88;fortyGigE0/92;fortyGigE0/96 False 0.0.0.0/0 @@ -289,7 +289,12 @@ Everflow Everflow - + + ERSPANV6 + EverflowV6 + EverflowV6 + + VTY_LINE ssh-only SSH @@ -964,9 +969,9 @@ true 0 - Force10-S6000 + Force10-S6000 - + diff --git a/ansible/minigraph/lab-s6100-01.t0-64.xml b/ansible/minigraph/lab-s6100-01.t0-64.xml index fe90fdb0752..fcd3091c006 100644 --- a/ansible/minigraph/lab-s6100-01.t0-64.xml +++ b/ansible/minigraph/lab-s6100-01.t0-64.xml @@ -220,7 +220,7 @@ Vlan1000 - fortyGigE1/1/7;fortyGigE1/1/8;fortyGigE1/1/9;fortyGigE1/1/10;fortyGigE1/1/11;fortyGigE1/1/12;fortyGigE1/1/13;fortyGigE1/1/14;fortyGigE1/1/15;fortyGigE1/1/16;fortyGigE1/2/7;fortyGigE1/2/8;fortyGigE1/2/9;fortyGigE1/2/10;fortyGigE1/2/11;fortyGigE1/2/12;fortyGigE1/2/13;fortyGigE1/2/14;fortyGigE1/2/15;fortyGigE1/2/16;fortyGigE1/3/1;fortyGigE1/3/5;fortyGigE1/3/6;fortyGigE1/3/7;fortyGigE1/3/8;fortyGigE1/3/9;fortyGigE1/3/10;fortyGigE1/3/11;fortyGigE1/4/1;fortyGigE1/4/5;fortyGigE1/4/6;fortyGigE1/4/7;fortyGigE1/4/8;fortyGigE1/4/9;fortyGigE1/4/10;fortyGigE1/4/11 + fortyGigE1/1/7;fortyGigE1/1/8;fortyGigE1/1/9;fortyGigE1/1/10;fortyGigE1/1/11;fortyGigE1/1/12;fortyGigE1/1/13;fortyGigE1/1/14;fortyGigE1/1/15;fortyGigE1/1/16;fortyGigE1/2/7;fortyGigE1/2/8;fortyGigE1/2/9;fortyGigE1/2/10;fortyGigE1/2/11;fortyGigE1/2/12;fortyGigE1/2/13;fortyGigE1/2/14;fortyGigE1/2/15;fortyGigE1/2/16;fortyGigE1/3/1;fortyGigE1/3/5;fortyGigE1/3/6;fortyGigE1/3/7;fortyGigE1/3/8;fortyGigE1/3/9;fortyGigE1/3/10;fortyGigE1/3/11;fortyGigE1/4/1;fortyGigE1/4/5;fortyGigE1/4/6;fortyGigE1/4/7;fortyGigE1/4/8;fortyGigE1/4/9;fortyGigE1/4/10;fortyGigE1/4/11 False 0.0.0.0/0 @@ -289,7 +289,12 @@ Everflow Everflow - + + ERSPANV6 + EverflowV6 + EverflowV6 + + VTY_LINE ssh-only SSH @@ -1492,9 +1497,9 @@ true 0 - Force10-S6100 + Force10-S6100 - + diff --git a/ansible/minigraph/lab-s6100-01.t1-64-lag.xml b/ansible/minigraph/lab-s6100-01.t1-64-lag.xml index bcfd6e6b80f..d6eb90ecf31 100644 --- a/ansible/minigraph/lab-s6100-01.t1-64-lag.xml +++ b/ansible/minigraph/lab-s6100-01.t1-64-lag.xml @@ -1155,7 +1155,12 @@ Everflow Everflow - + + ERSPANV6 + EverflowV6 + EverflowV6 + + VTY_LINE ssh-only SSH @@ -1405,13 +1410,6 @@ Arista-VM - - ARISTA05T0 - - 10.250.0.10 - - Arista-VM - ARISTA09T0 @@ -1420,9 +1418,9 @@ Arista-VM - ARISTA06T0 + ARISTA20T0 - 10.250.0.11 + 10.250.0.25 Arista-VM @@ -1469,9 +1467,9 @@ Arista-VM - ARISTA20T0 + ARISTA05T0 - 10.250.0.25 + 10.250.0.10 Arista-VM @@ -1545,6 +1543,13 @@ Arista-VM + + ARISTA06T0 + + 10.250.0.11 + + Arista-VM + @@ -2386,9 +2391,9 @@ true 0 - Force10-S6100 + Force10-S6100 - + diff --git a/ansible/minigraph/lab-s6100-01.t1-64.xml b/ansible/minigraph/lab-s6100-01.t1-64.xml index 846c4230f70..d0a516eb474 100644 --- a/ansible/minigraph/lab-s6100-01.t1-64.xml +++ b/ansible/minigraph/lab-s6100-01.t1-64.xml @@ -2635,7 +2635,12 @@ Everflow Everflow - + + ERSPANV6 + EverflowV6 + EverflowV6 + + VTY_LINE ssh-only SSH @@ -3186,6 +3191,13 @@ Arista-VM + + ARISTA21T0 + + 10.250.0.38 + + Arista-VM + ARISTA05T0 @@ -3271,9 +3283,9 @@ Arista-VM - ARISTA21T0 + ARISTA07T0 - 10.250.0.38 + 10.250.0.24 Arista-VM @@ -3291,6 +3303,13 @@ Arista-VM + + ARISTA03T0 + + 10.250.0.20 + + Arista-VM + ARISTA01T0 @@ -3362,9 +3381,9 @@ Arista-VM - ARISTA03T0 + ARISTA25T0 - 10.250.0.20 + 10.250.0.42 Arista-VM @@ -3411,16 +3430,16 @@ Arista-VM - ARISTA07T0 + ARISTA18T0 - 10.250.0.24 + 10.250.0.35 Arista-VM - ARISTA18T0 + ARISTA30T0 - 10.250.0.35 + 10.250.0.47 Arista-VM @@ -3445,13 +3464,6 @@ Arista-VM - - ARISTA30T0 - - 10.250.0.47 - - Arista-VM - ARISTA33T0 @@ -3473,13 +3485,6 @@ Arista-VM - - ARISTA25T0 - - 10.250.0.42 - - Arista-VM - ARISTA04T2 @@ -4398,9 +4403,9 @@ true 0 - Force10-S6100 + Force10-S6100 - + diff --git a/ansible/minigraph/str-msn2700-01.t0.xml b/ansible/minigraph/str-msn2700-01.t0.xml index f0c6dde021b..010e08335b3 100644 --- a/ansible/minigraph/str-msn2700-01.t0.xml +++ b/ansible/minigraph/str-msn2700-01.t0.xml @@ -220,7 +220,7 @@ Vlan1000 - etp2;etp3;etp4;etp5;etp6;etp7;etp8;etp9;etp10;etp11;etp12;etp13;etp14;etp15;etp16;etp17;etp18;etp19;etp20;etp21;etp22;etp23;etp24;etp25 + etp2;etp3;etp4;etp5;etp6;etp7;etp8;etp9;etp10;etp11;etp12;etp13;etp14;etp15;etp16;etp17;etp18;etp19;etp20;etp21;etp22;etp23;etp24;etp25 False 0.0.0.0/0 @@ -289,7 +289,12 @@ Everflow Everflow - + + ERSPANV6 + EverflowV6 + EverflowV6 + + VTY_LINE ssh-only SSH @@ -964,9 +969,9 @@ true 0 - ACS-MSN2700 + ACS-MSN2700 - + diff --git a/ansible/minigraph/str-msn2700-01.t1-lag.xml b/ansible/minigraph/str-msn2700-01.t1-lag.xml index d57101dae36..0236078ac7b 100644 --- a/ansible/minigraph/str-msn2700-01.t1-lag.xml +++ b/ansible/minigraph/str-msn2700-01.t1-lag.xml @@ -1075,7 +1075,12 @@ Everflow Everflow - + + ERSPANV6 + EverflowV6 + EverflowV6 + + VTY_LINE ssh-only SSH @@ -1918,9 +1923,9 @@ true 0 - ACS-MSN2700 + ACS-MSN2700 - + diff --git a/ansible/minigraph/str-msn2700-01.t1.xml b/ansible/minigraph/str-msn2700-01.t1.xml index 74b0c07fdb4..b1b449378af 100644 --- a/ansible/minigraph/str-msn2700-01.t1.xml +++ b/ansible/minigraph/str-msn2700-01.t1.xml @@ -1355,7 +1355,12 @@ Everflow Everflow - + + ERSPANV6 + EverflowV6 + EverflowV6 + + VTY_LINE ssh-only SSH @@ -2254,9 +2259,9 @@ true 0 - ACS-MSN2700 + ACS-MSN2700 - + diff --git a/ansible/templates/minigraph_device.j2 b/ansible/templates/minigraph_device.j2 index cfaad980078..8524e72de2b 100644 --- a/ansible/templates/minigraph_device.j2 +++ b/ansible/templates/minigraph_device.j2 @@ -26,8 +26,8 @@ true 0 - {{ hwsku }} + {{ hwsku }} - +