Merge branch 'latest devel' into audit

.github/workflows/ansible_test.yml

@@ -8,6 +8,7 @@ jobs:
   'ansible-test':
     name: Run ansible-test validation
     runs-on: ubuntu-latest
+    container: ubuntu:18.04
     env:
       PY_COLORS: 1 # allows molecule colors to be passed to GitHub Actions
       ANSIBLE_FORCE_COLOR: 1 # allows ansible colors to be passed to GitHub Actions
@@ -17,9 +18,22 @@ jobs:
         uses: actions/[email protected]
         with:
           python-version: '3.x'
+
+      - name: update packages
+        run: apt-get update
+
+      - name: 'Install sudo'
+        run: apt-get -q -y install sudo
+
+      - name: 'Install build essentials'
+        run: sudo apt-get install -q -y build-essential
+
       - name: 'Install requirements'
         run: make github-configure-ci
 
+      - name: 'Install docker'
+        run: make install-docker
+
       - name: 'Install Python requirements'
         run: make install-requirements
 

Makefile

@@ -114,3 +114,11 @@ install-requirements: ## Install python requirements for generic purpose
 	pip3 install --upgrade wheel
 	pip3 install -r development/requirements.txt
 	pip3 install -r development/requirements-dev.txt
+
+.PHONY: install-docker
+install-docker: ## Install docker
+	sudo apt install -q -y apt-transport-https ca-certificates curl software-properties-common
+	curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+	sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu bionic stable"
+	sudo apt update
+	sudo apt install -q -y docker-ce

ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/ethernet-interfaces.j2

@@ -101,12 +101,6 @@ interface {{ ethernet_interface }}
 {%             if ethernet_interfaces[ethernet_interface].ospf_area is defined and ethernet_interfaces[ethernet_interface].ospf_area is not none %}
    ip ospf area {{ ethernet_interfaces[ethernet_interface].ospf_area }}
 {%             endif %}
-{%             if ethernet_interfaces[ethernet_interface].pim.ipv4.sparse_mode is defined and ethernet_interfaces[ethernet_interface].pim.ipv4.sparse_mode == true %}
-   pim ipv4 sparse-mode
-{%             endif %}
-{%             if ethernet_interfaces[ethernet_interface].vmtracer is defined and ethernet_interfaces[ethernet_interface].vmtracer == true %}
-   vmtracer vmware-esx
-{%             endif %}
 {%             if ethernet_interfaces[ethernet_interface].isis_enable is defined %}
    isis enable {{ ethernet_interfaces[ethernet_interface].isis_enable }}
 {%             endif %}
@@ -128,4 +122,4 @@ interface {{ ethernet_interface }}
 {%         endif %}
 !
 {%     endfor %}
-{% endif %}
+{% endif %}