Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ansible/host-package-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
name: "{{ host_package_update_packages }}"
security: "{{ host_package_update_security | bool if ansible_facts.os_family == 'RedHat' else omit }}"
state: latest
update_cache: "{{ True if ansible_facts.os_family == 'Debian' else omit }}"
update_cache: True
become: true
19 changes: 16 additions & 3 deletions ansible/roles/dell-switch-sonic/templates/dell-sonic-config.j2
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,25 @@
{% endfor %}

{% for interface, config in dell_switch_sonic_interface_config.items() %}
{% if 'vlan' in interface | lower %}
interface {{ interface }}
{% if config.description is defined %}
description "{{ config.description }}"
description "{{ config.description }}"
{% endif %}
{% for line in config.config %}
{{ line }}
{{ line }}
{% endfor %}
{% endif %}
{% endfor %}
exit

{% for interface, config in dell_switch_sonic_interface_config.items() %}
{% if 'vlan' not in interface | lower %}
interface {{ interface }}
{% if config.description is defined %}
description "{{ config.description }}"
{% endif %}
{% for line in config.config %}
{{ line }}
{% endfor %}
{% endif %}
{% endfor %}
14 changes: 8 additions & 6 deletions playbooks/kayobe-base/pre.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,17 @@
src: overrides.yml.j2
dest: "{{ kayobe_config_src_dir }}/etc/kayobe/zz-10-overrides.yml"

- block:
- vars:
branch_prefix: "{{ 'unmaintained' if previous_release | lower == '2025.1' else 'stable' }}"
block:
- name: Ensure previous kayobe directory exists
file:
path: "{{ previous_kayobe_src_dir }}"
state: directory

- name: Ensure previous kayobe repository is cloned
command: >-
git clone {{ kayobe_src_dir }} {{ previous_kayobe_src_dir }} -b stable/{{ previous_release | lower }}
git clone {{ kayobe_src_dir }} {{ previous_kayobe_src_dir }} -b {{ branch_prefix }}/{{ previous_release | lower }}

- name: Ensure previous kayobe-config directory exists
file:
Expand All @@ -148,7 +150,7 @@

- name: Ensure kayobe-config repository is cloned
command: >-
git clone {{ kayobe_config_src_dir }} {{ previous_kayobe_config_src_dir }} -b stable/{{ previous_release | lower }}
git clone {{ kayobe_config_src_dir }} {{ previous_kayobe_config_src_dir }} -b {{ branch_prefix }}/{{ previous_release | lower }}

- name: Ensure previous kolla-ansible directory exists
file:
Expand All @@ -157,7 +159,7 @@

- name: Ensure previous kolla-ansible repository is cloned
command: >-
git clone {{ kolla_ansible_src_dir }} {{ previous_kolla_ansible_src_dir }} -b stable/{{ previous_release | lower }}
git clone {{ kolla_ansible_src_dir }} {{ previous_kolla_ansible_src_dir }} -b {{ branch_prefix }}/{{ previous_release | lower }}

- name: Ensure previous kayobe is executed in verbose mode
lineinfile:
Expand All @@ -180,14 +182,14 @@
name: kayobe-galaxy-requirements
vars:
kayobe_galaxy_requirements_src_dir: "{{ previous_kayobe_src_dir }}"
kayobe_galaxy_requirements_branch: "stable/{{ previous_release | lower }}"
kayobe_galaxy_requirements_branch: "{{ branch_prefix }}/{{ previous_release | lower }}"

- name: Update kolla-ansible requirements.yml
include_role:
name: kayobe-galaxy-requirements
vars:
kayobe_galaxy_requirements_src_dir: "{{ previous_kolla_ansible_src_dir }}"
kayobe_galaxy_requirements_branch: "stable/{{ previous_release | lower }}"
kayobe_galaxy_requirements_branch: "{{ branch_prefix }}/{{ previous_release | lower }}"
kayobe_galaxy_requirements_dest_path: "/tmp/previous-kolla-ansible-requirements.yml"

when: is_upgrade
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
fixes:
- |
Fixed Dell SONiC switch config indentation. Also made sure that VLAN
interfaces are defined first as others might depend on them.
Related bug:
`LP#2168529 <https://bugs.launchpad.net/kayobe/+bug/2168529>`__
5 changes: 5 additions & 0 deletions releasenotes/notes/update-dnf-cache-63b0249549118a3e.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
features:
- |
Adds support for updating cache during host package update on all
supported systems.
Loading