diff --git a/ansible/host-package-update.yml b/ansible/host-package-update.yml index 77be7c722..6e99df86a 100644 --- a/ansible/host-package-update.yml +++ b/ansible/host-package-update.yml @@ -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 diff --git a/ansible/roles/dell-switch-sonic/templates/dell-sonic-config.j2 b/ansible/roles/dell-switch-sonic/templates/dell-sonic-config.j2 index 14a71e5af..184179531 100644 --- a/ansible/roles/dell-switch-sonic/templates/dell-sonic-config.j2 +++ b/ansible/roles/dell-switch-sonic/templates/dell-sonic-config.j2 @@ -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 %} diff --git a/playbooks/kayobe-base/pre.yml b/playbooks/kayobe-base/pre.yml index a8be2b19c..bf09ad203 100644 --- a/playbooks/kayobe-base/pre.yml +++ b/playbooks/kayobe-base/pre.yml @@ -131,7 +131,9 @@ 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 }}" @@ -139,7 +141,7 @@ - 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: @@ -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: @@ -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: @@ -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 diff --git a/releasenotes/notes/fix-dell-sonic-switch-template-3862feec20b3a597.yaml b/releasenotes/notes/fix-dell-sonic-switch-template-3862feec20b3a597.yaml new file mode 100644 index 000000000..e4f9d64d5 --- /dev/null +++ b/releasenotes/notes/fix-dell-sonic-switch-template-3862feec20b3a597.yaml @@ -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 `__ diff --git a/releasenotes/notes/update-dnf-cache-63b0249549118a3e.yaml b/releasenotes/notes/update-dnf-cache-63b0249549118a3e.yaml new file mode 100644 index 000000000..0f16102f0 --- /dev/null +++ b/releasenotes/notes/update-dnf-cache-63b0249549118a3e.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + Adds support for updating cache during host package update on all + supported systems.