From 9d41d536f69e1b9a4d234cdef297fea967ef9bd9 Mon Sep 17 00:00:00 2001 From: JulioPDX Date: Tue, 30 Jul 2024 14:28:09 -0700 Subject: [PATCH 1/3] updates for 4.10 --- .github/workflows/dev.yml | 2 +- .github/workflows/prod.yml | 2 +- global_vars/global_dc_vars.yml | 2 +- requirements.txt | 12 ------------ requirements.yml | 2 +- 5 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 requirements.txt diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index ff8f51899..5b1a11d10 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -22,7 +22,7 @@ jobs: # uses: actions/setup-python@v5 # - name: Install Python requirements - # run: pip3 install -r requirements.txt + # run: pip3 install "pyavd[ansible]==4.10.0" # - name: Run pre-commit on files # uses: pre-commit/action@v3.0.0 diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml index cad9cfc41..5da7ef39c 100644 --- a/.github/workflows/prod.yml +++ b/.github/workflows/prod.yml @@ -22,7 +22,7 @@ jobs: # uses: actions/setup-python@v5 # - name: Install Python requirements - # run: pip3 install -r requirements.txt + # run: pip3 install "pyavd[ansible]==4.10.0" # - name: Run pre-commit on files # uses: pre-commit/action@v3.0.0 diff --git a/global_vars/global_dc_vars.yml b/global_vars/global_dc_vars.yml index 97a971c92..f4ea9ee4c 100644 --- a/global_vars/global_dc_vars.yml +++ b/global_vars/global_dc_vars.yml @@ -21,7 +21,7 @@ local_users: - name: arista privilege: 15 role: network-admin - sha512_password: "{{ ansible_password | password_hash(salt='workshop') }}" + sha512_password: "{{ ansible_password | password_hash('sha512', rounds='5000', salt='arista') }}" # AAA aaa_authorization: diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index c5fad2ee3..000000000 --- a/requirements.txt +++ /dev/null @@ -1,12 +0,0 @@ -ansible-core==2.15.5 -netaddr>=0.7.19 -Jinja2>=3.0.0 -treelib>=1.5.5 -cvprac>=1.3.1 -paramiko>=2.7.1 -jsonschema==4.17.3 -requests>=2.27.0 -PyYAML>=6.0.0 -md-toc>=7.1.0 -deepmerge>=1.1.0 -cryptography>=38.0.4 diff --git a/requirements.yml b/requirements.yml index a1dfcc7d7..801d4298d 100644 --- a/requirements.yml +++ b/requirements.yml @@ -2,7 +2,7 @@ collections: - name: arista.avd - version: 4.5.0 + version: 4.10.0 - name: arista.cvp version: 3.10.1 From 9f1dc3795b9d49930cc19b92b488589bd096d3f5 Mon Sep 17 00:00:00 2001 From: JulioPDX Date: Tue, 30 Jul 2024 14:38:57 -0700 Subject: [PATCH 2/3] Correcting rounds --- global_vars/global_dc_vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global_vars/global_dc_vars.yml b/global_vars/global_dc_vars.yml index f4ea9ee4c..ddd1acd74 100644 --- a/global_vars/global_dc_vars.yml +++ b/global_vars/global_dc_vars.yml @@ -21,7 +21,7 @@ local_users: - name: arista privilege: 15 role: network-admin - sha512_password: "{{ ansible_password | password_hash('sha512', rounds='5000', salt='arista') }}" + sha512_password: "{{ ansible_password | password_hash('sha512', rounds=5000, salt='arista') }}" # AAA aaa_authorization: From bb0f351de316672f032b3053215c8ed1f1ed113a Mon Sep 17 00:00:00 2001 From: JulioPDX Date: Tue, 30 Jul 2024 14:51:56 -0700 Subject: [PATCH 3/3] Correcting password hash --- global_vars/global_dc_vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global_vars/global_dc_vars.yml b/global_vars/global_dc_vars.yml index ddd1acd74..016e7da5a 100644 --- a/global_vars/global_dc_vars.yml +++ b/global_vars/global_dc_vars.yml @@ -21,7 +21,7 @@ local_users: - name: arista privilege: 15 role: network-admin - sha512_password: "{{ ansible_password | password_hash('sha512', rounds=5000, salt='arista') }}" + sha512_password: "{{ ansible_password | password_hash('sha512', salt='arista') }}" # AAA aaa_authorization: