mlnx: Duplicate resource to manage [DEFAULT] interface_driver and [DEFAULT] dhcp_broadcast_reply

[Takashi Kajinami]

The following change introduced the ability to manage [DEFAULT] interface_driver in dhcp-agent.conf and l3-agent.conf to the neutron::agents::ml2::mlnx class.

 https://review.opendev.org/c/openstack/puppet-neutron/+/679556

However these parameters are already managed by the neutron::agents::dhcp class and the neutron::agents::l3 class.

When these classes are used in the same manifest, puppet apply fails because of the duplicate resources.

[Takashi Kajinami (kajinamit)]

It seems the [DEFAULT] dhcp_broadcast_reply parameter is duplicated.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.opendev.org/c/openstack/puppet-neutron/+/854292

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.opendev.org/c/openstack/puppet-neutron/+/854654

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/puppet-neutron/+/854292
Committed: https://opendev.org/openstack/puppet-neutron/commit/c4f3abe22e5f57a03c5953f0b342433d93f36731
Submitter: "Zuul (22348)"
Branch: master

commit c4f3abe22e5f57a03c5953f0b342433d93f36731
Author: Takashi Kajinami <email address hidden>
Date: Wed Aug 24 09:52:06 2022 +0900

    mlnx: Allow workaround for duplicate resources

    The commit b2e7de79df98a986768aaef203ddbe02bee41072 , which was merged
    during Train cycle, introduced a few new parameters to support multi
    interface driver, but the following two parameters are already declared
    in the corresponding agent classes and trigger duplicate resource
    declaration when these classes are used in a single manifest.
     - dhcp_broadcast_reply
     - interface_driver

    This change allows users to workaround the problem. Details are
    documented in the release note.

    Closes-Bug: #1987460
    Change-Id: I993523dc7f0ec8ad90a50d049dc0f5ccf9f2b191

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/yoga
Review: https://review.opendev.org/c/openstack/puppet-neutron/+/854809

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/puppet-neutron/+/854654
Committed: https://opendev.org/openstack/puppet-neutron/commit/f7b4c844bc95056d8a242332bcf60fcb5b49d8f5
Submitter: "Zuul (22348)"
Branch: master

commit f7b4c844bc95056d8a242332bcf60fcb5b49d8f5
Author: Takashi Kajinami <email address hidden>
Date: Fri Aug 26 01:22:28 2022 +0900

    mlnx: Deprecate duplicate parameters

    This change deprecates the parameters which are conflicting with
    other service classes such as neutron::agents::dhcp, so that we can
    remove these parameters completely in a future release.

    Related-Bug: #1987460
    Change-Id: I2ed2241b304bf2280112b4f6beaff36975500f5e

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/xena
Review: https://review.opendev.org/c/openstack/puppet-neutron/+/854894

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/wallaby
Review: https://review.opendev.org/c/openstack/puppet-neutron/+/854895

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/puppet-neutron/+/854894
Committed: https://opendev.org/openstack/puppet-neutron/commit/1f26bbfda91d0c5f4c8f99da2790c84dbb64ad76
Submitter: "Zuul (22348)"
Branch: stable/xena

commit 1f26bbfda91d0c5f4c8f99da2790c84dbb64ad76
Author: Takashi Kajinami <email address hidden>
Date: Wed Aug 24 09:52:06 2022 +0900

    mlnx: Allow workaround for duplicate resources

    The commit b2e7de79df98a986768aaef203ddbe02bee41072 , which was merged
    during Train cycle, introduced a few new parameters to support multi
    interface driver, but the following two parameters are already declared
    in the corresponding agent classes and trigger duplicate resource
    declaration when these classes are used in a single manifest.
     - dhcp_broadcast_reply
     - interface_driver

    This change allows users to workaround the problem. Details are
    documented in the release note.

    Closes-Bug: #1987460
    Change-Id: I993523dc7f0ec8ad90a50d049dc0f5ccf9f2b191
    (cherry picked from commit c4f3abe22e5f57a03c5953f0b342433d93f36731)
    (cherry picked from commit 49bfd89810d85dccd658ea9f16480c679d5955d1)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/puppet-neutron/+/854809
Committed: https://opendev.org/openstack/puppet-neutron/commit/49bfd89810d85dccd658ea9f16480c679d5955d1
Submitter: "Zuul (22348)"
Branch: stable/yoga

commit 49bfd89810d85dccd658ea9f16480c679d5955d1
Author: Takashi Kajinami <email address hidden>
Date: Wed Aug 24 09:52:06 2022 +0900

    mlnx: Allow workaround for duplicate resources

    The commit b2e7de79df98a986768aaef203ddbe02bee41072 , which was merged
    during Train cycle, introduced a few new parameters to support multi
    interface driver, but the following two parameters are already declared
    in the corresponding agent classes and trigger duplicate resource
    declaration when these classes are used in a single manifest.
     - dhcp_broadcast_reply
     - interface_driver

    This change allows users to workaround the problem. Details are
    documented in the release note.

    Closes-Bug: #1987460
    Change-Id: I993523dc7f0ec8ad90a50d049dc0f5ccf9f2b191
    (cherry picked from commit c4f3abe22e5f57a03c5953f0b342433d93f36731)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/puppet-neutron/+/854895
Committed: https://opendev.org/openstack/puppet-neutron/commit/181975c44d803c1833cdaadaac06247d0c0fb3c6
Submitter: "Zuul (22348)"
Branch: stable/wallaby

commit 181975c44d803c1833cdaadaac06247d0c0fb3c6
Author: Takashi Kajinami <email address hidden>
Date: Wed Aug 24 09:52:06 2022 +0900

    mlnx: Allow workaround for duplicate resources

    The commit b2e7de79df98a986768aaef203ddbe02bee41072 , which was merged
    during Train cycle, introduced a few new parameters to support multi
    interface driver, but the following two parameters are already declared
    in the corresponding agent classes and trigger duplicate resource
    declaration when these classes are used in a single manifest.
     - dhcp_broadcast_reply
     - interface_driver

    This change allows users to workaround the problem. Details are
    documented in the release note.

    Closes-Bug: #1987460
    Change-Id: I993523dc7f0ec8ad90a50d049dc0f5ccf9f2b191
    (cherry picked from commit c4f3abe22e5f57a03c5953f0b342433d93f36731)
    (cherry picked from commit 49bfd89810d85dccd658ea9f16480c679d5955d1)
    (cherry picked from commit 1f26bbfda91d0c5f4c8f99da2790c84dbb64ad76)

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/victoria
Review: https://review.opendev.org/c/openstack/puppet-neutron/+/855136

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/puppet-neutron/+/855136
Committed: https://opendev.org/openstack/puppet-neutron/commit/29e3ff1ee3f787219328b4c7961a3ee544c91f05
Submitter: "Zuul (22348)"
Branch: stable/victoria

commit 29e3ff1ee3f787219328b4c7961a3ee544c91f05
Author: Takashi Kajinami <email address hidden>
Date: Wed Aug 24 09:52:06 2022 +0900

    mlnx: Allow workaround for duplicate resources

    The commit b2e7de79df98a986768aaef203ddbe02bee41072 , which was merged
    during Train cycle, introduced a few new parameters to support multi
    interface driver, but the following two parameters are already declared
    in the corresponding agent classes and trigger duplicate resource
    declaration when these classes are used in a single manifest.
     - dhcp_broadcast_reply
     - interface_driver

    This change allows users to workaround the problem. Details are
    documented in the release note.

    Closes-Bug: #1987460
    Change-Id: I993523dc7f0ec8ad90a50d049dc0f5ccf9f2b191
    (cherry picked from commit c4f3abe22e5f57a03c5953f0b342433d93f36731)
    (cherry picked from commit 49bfd89810d85dccd658ea9f16480c679d5955d1)
    (cherry picked from commit 1f26bbfda91d0c5f4c8f99da2790c84dbb64ad76)
    (cherry picked from commit 181975c44d803c1833cdaadaac06247d0c0fb3c6)

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/ussuri
Review: https://review.opendev.org/c/openstack/puppet-neutron/+/855558

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/puppet-neutron/+/855558
Committed: https://opendev.org/openstack/puppet-neutron/commit/0b225b0bd1f786212aaf21b370e7e54525442c66
Submitter: "Zuul (22348)"
Branch: stable/ussuri

commit 0b225b0bd1f786212aaf21b370e7e54525442c66
Author: Takashi Kajinami <email address hidden>
Date: Wed Aug 24 09:52:06 2022 +0900

    mlnx: Allow workaround for duplicate resources

    The commit b2e7de79df98a986768aaef203ddbe02bee41072 , which was merged
    during Train cycle, introduced a few new parameters to support multi
    interface driver, but the following two parameters are already declared
    in the corresponding agent classes and trigger duplicate resource
    declaration when these classes are used in a single manifest.
     - dhcp_broadcast_reply
     - interface_driver

    This change allows users to workaround the problem. Details are
    documented in the release note.

    Closes-Bug: #1987460
    Change-Id: I993523dc7f0ec8ad90a50d049dc0f5ccf9f2b191
    (cherry picked from commit c4f3abe22e5f57a03c5953f0b342433d93f36731)
    (cherry picked from commit 49bfd89810d85dccd658ea9f16480c679d5955d1)
    (cherry picked from commit 1f26bbfda91d0c5f4c8f99da2790c84dbb64ad76)
    (cherry picked from commit 181975c44d803c1833cdaadaac06247d0c0fb3c6)
    (cherry picked from commit 29e3ff1ee3f787219328b4c7961a3ee544c91f05)

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/train
Review: https://review.opendev.org/c/openstack/puppet-neutron/+/856206

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/puppet-neutron/+/856206
Committed: https://opendev.org/openstack/puppet-neutron/commit/b2d406629ad1ce4b784e7c9b1be87f570089c468
Submitter: "Zuul (22348)"
Branch: stable/train

commit b2d406629ad1ce4b784e7c9b1be87f570089c468
Author: Takashi Kajinami <email address hidden>
Date: Wed Aug 24 09:52:06 2022 +0900

    mlnx: Allow workaround for duplicate resources

    The commit b2e7de79df98a986768aaef203ddbe02bee41072 , which was merged
    during Train cycle, introduced a few new parameters to support multi
    interface driver, but the following two parameters are already declared
    in the corresponding agent classes and trigger duplicate resource
    declaration when these classes are used in a single manifest.
     - dhcp_broadcast_reply
     - interface_driver

    This change allows users to workaround the problem. Details are
    documented in the release note.

    Closes-Bug: #1987460
    Change-Id: I993523dc7f0ec8ad90a50d049dc0f5ccf9f2b191
    (cherry picked from commit c4f3abe22e5f57a03c5953f0b342433d93f36731)
    (cherry picked from commit 49bfd89810d85dccd658ea9f16480c679d5955d1)
    (cherry picked from commit 1f26bbfda91d0c5f4c8f99da2790c84dbb64ad76)
    (cherry picked from commit 181975c44d803c1833cdaadaac06247d0c0fb3c6)
    (cherry picked from commit 29e3ff1ee3f787219328b4c7961a3ee544c91f05)
    (cherry picked from commit 0b225b0bd1f786212aaf21b370e7e54525442c66)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/puppet-neutron 21.0.0 release.

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/puppet-neutron 18.6.0 release.

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/puppet-neutron 19.5.0 release.

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/puppet-neutron 20.4.0 release.

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/puppet-neutron victoria-eol release.

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/puppet-neutron ussuri-eol release.

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/puppet-neutron train-eol release.