From d9194c407bbae100ab3b85d727b4740d6b9a8635 Mon Sep 17 00:00:00 2001 From: Carl Buchmann Date: Thu, 8 Aug 2024 16:11:17 -0400 Subject: [PATCH 1/5] remove centos7-8 from testing --- .../molecule/dhcp_management_mac/molecule.yml | 22 +++---------------- .../cvp/molecule/dhcp_system_mac/molecule.yml | 21 ++---------------- 2 files changed, 5 insertions(+), 38 deletions(-) diff --git a/ansible_collections/arista/cvp/molecule/dhcp_management_mac/molecule.yml b/ansible_collections/arista/cvp/molecule/dhcp_management_mac/molecule.yml index 49b7494d0..54a9351e4 100644 --- a/ansible_collections/arista/cvp/molecule/dhcp_management_mac/molecule.yml +++ b/ansible_collections/arista/cvp/molecule/dhcp_management_mac/molecule.yml @@ -25,7 +25,7 @@ scenario: - destroy test_sequence: # - dependency - - lint + # - lint # - cleanup - destroy - syntax @@ -42,24 +42,8 @@ dependency: driver: name: docker platforms: - - name: centos7-systemd - image: centos:7 - command: /sbin/init - tmpfs: - - /run - - /tmp - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:ro - - name: centos8-systemd - image: centos:8 - command: /sbin/init - tmpfs: - - /run - - /tmp - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:ro - - name: ubuntu - image: ubuntu:18.04 + - name: ubuntu-22.04 + image: ubuntu:22.04 provisioner: log: true name: ansible diff --git a/ansible_collections/arista/cvp/molecule/dhcp_system_mac/molecule.yml b/ansible_collections/arista/cvp/molecule/dhcp_system_mac/molecule.yml index 728fb1c8d..1818b8f2f 100644 --- a/ansible_collections/arista/cvp/molecule/dhcp_system_mac/molecule.yml +++ b/ansible_collections/arista/cvp/molecule/dhcp_system_mac/molecule.yml @@ -25,7 +25,6 @@ scenario: - destroy test_sequence: # - dependency - - lint # - cleanup - destroy - syntax @@ -42,24 +41,8 @@ dependency: driver: name: docker platforms: - - name: centos7-systemd - image: centos:7 - command: /sbin/init - tmpfs: - - /run - - /tmp - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:ro - - name: centos8-systemd - image: centos:8 - command: /sbin/init - tmpfs: - - /run - - /tmp - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:ro - - name: ubuntu - image: ubuntu:18.04 + - name: ubuntu-22.04 + image: ubuntu:22.04 provisioner: log: true name: ansible From b8ba5b4bbea82ee26ae3eb7320533d5391909a5a Mon Sep 17 00:00:00 2001 From: Carl Buchmann Date: Thu, 8 Aug 2024 16:12:17 -0400 Subject: [PATCH 2/5] + depecration warning and cleanup --- .../arista/cvp/roles/dhcp_configuration/README.md | 6 +++++- .../cvp/roles/dhcp_configuration/defaults/main.yml | 2 +- .../cvp/roles/dhcp_configuration/tasks/main.yml | 11 ++++++++++- .../arista/cvp/roles/dhcp_configuration/vars/main.yml | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ansible_collections/arista/cvp/roles/dhcp_configuration/README.md b/ansible_collections/arista/cvp/roles/dhcp_configuration/README.md index 384cc1d7f..52cdcc82a 100644 --- a/ansible_collections/arista/cvp/roles/dhcp_configuration/README.md +++ b/ansible_collections/arista/cvp/roles/dhcp_configuration/README.md @@ -4,6 +4,10 @@ ~ that can be found in the LICENSE file. --> +!!! warning + + The dhcp_configuration role has been deprecated and will be removed in version 4.0.0. + # dhcp_configuration role Ansible role to provision and configure Zero Touch Provisioning on a CloudVision server. Role will do the following: @@ -23,7 +27,7 @@ Below is a list of platforms where DHCPd configuration has been tested: - Centos 7 / 8 - Ubuntu 18.02 -- Arista CloudVision 2019 and onward (for lab purpose) +- Ubuntu 22.04 This role should work on any platform running [ISC-DHCP server](https://www.isc.org/dhcp/). diff --git a/ansible_collections/arista/cvp/roles/dhcp_configuration/defaults/main.yml b/ansible_collections/arista/cvp/roles/dhcp_configuration/defaults/main.yml index 217690f55..9e7a79544 100644 --- a/ansible_collections/arista/cvp/roles/dhcp_configuration/defaults/main.yml +++ b/ansible_collections/arista/cvp/roles/dhcp_configuration/defaults/main.yml @@ -1,5 +1,5 @@ --- -# defaults file for ztp-setup +# defaults file for dhcp_configuration # Configure default connection parameter. ansible_connection: paramiko diff --git a/ansible_collections/arista/cvp/roles/dhcp_configuration/tasks/main.yml b/ansible_collections/arista/cvp/roles/dhcp_configuration/tasks/main.yml index 05d26531d..0c4c57aaf 100644 --- a/ansible_collections/arista/cvp/roles/dhcp_configuration/tasks/main.yml +++ b/ansible_collections/arista/cvp/roles/dhcp_configuration/tasks/main.yml @@ -2,7 +2,16 @@ # Use of this source code is governed by the Apache License 2.0 # that can be found in the LICENSE file. --- -# tasks file for ztp-setup +# tasks file for dhcp_configuration + +- name: Deprecation warning! + delegate_to: localhost + debug: + msg: + - "!!! Deprecation Warning - Please note this role has been deprecated." + - "!!! Deprecation Warning - This role will be removed in version 4.0.0." + run_once: true + # If mode=online launch server configuration # If mode=offline generate dhcpd.conf to {{output_dir}} - name: Start creation/update process. diff --git a/ansible_collections/arista/cvp/roles/dhcp_configuration/vars/main.yml b/ansible_collections/arista/cvp/roles/dhcp_configuration/vars/main.yml index 37871de61..b0c7e1213 100644 --- a/ansible_collections/arista/cvp/roles/dhcp_configuration/vars/main.yml +++ b/ansible_collections/arista/cvp/roles/dhcp_configuration/vars/main.yml @@ -1,2 +1,2 @@ --- -# vars file for ztp-setup +# vars file for dhcp_configuration \ No newline at end of file From ad6f645a92b8ed301d3587f738159bb9158534c3 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 20:18:18 +0000 Subject: [PATCH 3/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .../arista/cvp/roles/dhcp_configuration/vars/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible_collections/arista/cvp/roles/dhcp_configuration/vars/main.yml b/ansible_collections/arista/cvp/roles/dhcp_configuration/vars/main.yml index b0c7e1213..f21397700 100644 --- a/ansible_collections/arista/cvp/roles/dhcp_configuration/vars/main.yml +++ b/ansible_collections/arista/cvp/roles/dhcp_configuration/vars/main.yml @@ -1,2 +1,2 @@ --- -# vars file for dhcp_configuration \ No newline at end of file +# vars file for dhcp_configuration From 3be438ee2410fed0a445cdf8dde930d4b2835152 Mon Sep 17 00:00:00 2001 From: Carl Buchmann Date: Fri, 9 Aug 2024 09:01:41 -0400 Subject: [PATCH 4/5] address ansible-lint issue --- .../arista/cvp/roles/dhcp_configuration/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible_collections/arista/cvp/roles/dhcp_configuration/tasks/main.yml b/ansible_collections/arista/cvp/roles/dhcp_configuration/tasks/main.yml index 0c4c57aaf..ca83c8941 100644 --- a/ansible_collections/arista/cvp/roles/dhcp_configuration/tasks/main.yml +++ b/ansible_collections/arista/cvp/roles/dhcp_configuration/tasks/main.yml @@ -6,7 +6,7 @@ - name: Deprecation warning! delegate_to: localhost - debug: + ansible.builtin.debug: msg: - "!!! Deprecation Warning - Please note this role has been deprecated." - "!!! Deprecation Warning - This role will be removed in version 4.0.0." From 9edab113972d019d69ec99aa27ba36ac1803e08c Mon Sep 17 00:00:00 2001 From: Carl Buchmann Date: Fri, 9 Aug 2024 09:04:17 -0400 Subject: [PATCH 5/5] + release notes --- ansible_collections/arista/cvp/docs/release-notes/v3.x.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ansible_collections/arista/cvp/docs/release-notes/v3.x.md b/ansible_collections/arista/cvp/docs/release-notes/v3.x.md index cc353d8d7..4d697cbbd 100644 --- a/ansible_collections/arista/cvp/docs/release-notes/v3.x.md +++ b/ansible_collections/arista/cvp/docs/release-notes/v3.x.md @@ -14,6 +14,12 @@ - On premise version higher than 2021.3.0 - CloudVision as a Service +## Release 3.11.0 + +### Deprecations + +- The `dhcp_configuration` role has been deprecated and will be removed in version 4.0.0. + ## Release 3.10.1 Full release note available on [github](https://github.com/aristanetworks/ansible-cvp/releases/tag/v3.10.1)