Merge pull request #451 from stackhpc/upstream/2024.1-2025-07-11

Synchronise 2024.1 with upstream

Author: bbezak

ansible/inventory/group_vars/all/kolla

@@ -209,6 +209,8 @@ overcloud_container_image_regex_map:
     enabled: "{{ kolla_enable_neutron | bool }}"
   - regex: "neutron-\\(dhcp\\|l3\\|linuxbridge\\|openvswitch\\)-agent"
     enabled: "{{ kolla_build_neutron_ovs | default(kolla_enable_neutron | bool and not kolla_enable_ovn | bool) }}"
+  - regex: neutron-bgp-dragent
+    enabled: "{{ kolla_enable_neutron_bgp_dragent | bool }}"
   - regex: neutron-mlnx-agent
     enabled: "{{ kolla_enable_neutron_mlnx | bool }}"
   - regex: neutron-ovn-agent
@@ -547,6 +549,7 @@ kolla_enable_manila: "no"
 kolla_enable_masakari: "no"
 kolla_enable_mistral: "no"
 kolla_enable_multipathd: "no"
+kolla_enable_neutron_bgp_dragent: "no"
 kolla_enable_neutron_mlnx: "no"
 kolla_enable_neutron_provider_networks: "no"
 kolla_enable_neutron_sriov: "no"

ansible/inventory/group_vars/all/switches/junos

@@ -1,28 +1,9 @@
 ---
 # Switch configuration.
 
-###############################################################################
-# Authentication configuration.
-
-# For Juniper switches, this defines a 'provider' argument to the junos_*
-# modules.
-switch_junos_provider:
-  host: "{{ ansible_host|default(inventory_hostname) }}"
-  username: "{{ ansible_user }}"
-  password: "{{ ansible_ssh_pass|default(omit) }}"
-  ssh_keyfile: "{{ ansible_ssh_private_key_file|default(omit) }}"
-  timeout: "{{ switch_junos_timeout }}"
-
 ###############################################################################
 # Configuration format.
 
 # Format of configuration in junos_switch_config and
 # junos_switch_interface_config. May be one of 'set', 'text' or 'json'.
 switch_junos_config_format: text
-
-###############################################################################
-# Timeout.
-
-# Timeout in seconds for communicating with the network device either for
-# connecting or sending commands.
-switch_junos_timeout: 10

ansible/physical-network.yml

@@ -169,7 +169,6 @@
 
     - role: junos-switch
       junos_switch_type: "{{ switch_type }}"
-      junos_switch_provider: "{{ switch_junos_provider }}"
       junos_switch_config_format: "{{ switch_junos_config_format }}"
       junos_switch_config: "{{ switch_config }}"
       junos_switch_interface_config: "{{ switch_interface_config }}"

ansible/roles/junos-switch/README.md

@@ -1,10 +1,10 @@
 JunOS Switch
 ============
 
-This role configures Juniper switches using the `junos` Ansible modules.  It
-provides a fairly minimal abstraction of the configuration interface provided
-by the `junos` modules, allowing for application of arbitrary switch
-configuration options.
+This role configures Juniper switches using the `junipernetworks.junos` Ansible
+collection. It provides a fairly minimal abstraction of the configuration
+interface provided by the collection, allowing for application of arbitrary
+switch configuration options.
 
 Requirements
 ------------
@@ -14,12 +14,6 @@ The switches should be configured to allow access to NETCONF via SSH.
 Role Variables
 --------------
 
-`junos_switch_delegate_to` is the host on which to execute the `junos` Ansible
-modules.
-
-`junos_switch_provider` is authentication provider information passed as the
-`provider` argument to the `junos` modules.
-
 `junos_switch_config_format` is the format of configuration in
 `junos_switch_config` and `junos_switch_interface_config`. May be one of `set`,
 `text` or `json`.
@@ -53,11 +47,6 @@ passwords.  It applies global configuration for LLDP, and enables two
       gather_facts: no
       roles:
         - role: junos-switch
-          junos_switch_delegate_to: localhost
-          junos_switch_provider:
-            host: "{{ switch_host }}"
-            username: "{{ switch_user }}"
-            password: "{{ switch_password }}"
           junos_switch_config:
             - "protocols {"
             - "    lldp {"

ansible/roles/junos-switch/defaults/main.yml

@@ -1,7 +1,4 @@
 ---
-# Authentication provider information.
-junos_switch_provider:
-
 # Format of configuration in junos_switch_config and
 # junos_switch_interface_config. May be one of 'set', 'text' or 'json'.
 junos_switch_config_format: text

ansible/roles/junos-switch/tasks/main.yml

@@ -15,9 +15,7 @@
   run_once: true
 
 - name: Ensure Juniper switches are configured
-  local_action:
-    module: junos_config
-    provider: "{{ junos_switch_provider }}"
+  junos_config:
     src: "{{ junos_switch_src }}"
     src_format: "{{ junos_switch_config_format }}"
   vars:

doc/source/configuration/reference/physical-network.rst

@@ -284,24 +284,14 @@ module.
 configuration.  The variable is passed as the ``src_format`` argument to the
 ``junos_config`` module.  The default value is ``text``.
 
-Provider
-^^^^^^^^
-
 * ``ansible_host`` is the hostname or IP address.  Optional.
-
 * ``ansible_user`` is the SSH username.
-
 * ``ansible_ssh_pass`` is the SSH password.  Mutually exclusive with
   ``ansible_ssh_private_key_file``.
-
 * ``ansible_ssh_private_key_file`` is the SSH private key file.  Mutually
   exclusive with ``ansible_ssh_pass``.
-
-* ``switch_junos_timeout`` may be set to a timeout in seconds for communicating
-  with the device.
-
-Alternatively, set ``switch_junos_provider`` to the value to be passed as the
-``provider`` argument to the ``junos_config`` module.
+* ``ansible_connection`` should be ``ansible.netcommon.netconf``.
+* ``ansible_network_os`` should be ``junipernetworks.junos.junos``.
 
 Mellanox MLNX OS
 ----------------

releasenotes/notes/bug-2111341-706fe5689414a9c1.yaml

@@ -0,0 +1,15 @@
+---
+upgrade:
+  - |
+    Deployments using Juniper Junos OS switches are required to update their
+    configuration according to `Juniper Junos OS documentation
+    <https://docs.openstack.org/kayobe/latest/configuration/reference/physical-network.html#juniper-junos-os>`_.
+    This is due to the ``junos_config`` module dropping support for the
+    ``provider`` parameter.
+fixes:
+  - |
+    Fixes physical network configuration for Juniper Junos OS switches.
+    Note that users are required to update their configuration according to
+    `Juniper Junos OS documentation
+    <https://docs.openstack.org/kayobe/latest/configuration/reference/physical-network.html#juniper-junos-os>`_.
+    `LP#2111341 <https://bugs.launchpad.net/kayobe/+bug/2111341>`__

releasenotes/notes/build-neutron-bgp-dragent-a6b28ce7e22d8145.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The ``neutron-bgp-dragent`` container will now be built by default when
+    ``kolla_enable_neutron_bgp_dragent`` is true.