dhcp_agents_per_network set to 1 when deploying multiple nodes running the NeutronDhcpAgent service

[Marius Cornea]

dhcp_agents_per_network is set to 1 when deploying multiple nodes running the NeutronDhcpAgent service.

I'm doing a deployment with 3 controllers and 2 networker nodes running the Neutron agents including the dhcp agent. The deployed configuration ends up with dhcp_agents_per_network=1 and I'd expect it to be equal to the number of nodes that run the NeutronDhcpAgent service.

export THT=/usr/share/openstack-tripleo-heat-templates/

openstack overcloud deploy --templates $THT \
-r ~/openstack_deployment/roles/roles_data.yaml \
-e $THT/environments/network-isolation.yaml \
-e $THT/environments/network-management.yaml \
-e $THT/environments/storage-environment.yaml \
-e $THT/environments/puppet-pacemaker.yaml \
-e ~/openstack_deployment/environments/nodes.yaml \
-e ~/openstack_deployment/environments/network-environment.yaml \
-e ~/openstack_deployment/environments/disk-layout.yaml \
-e ~/openstack_deployment/environments/neutron-settings.yaml

Environment files:
http://paste.openstack.org/show/585459/

[Brad P. Crochet (brad-9)]

There is currently logic[1] in the client code to set this. It's odd that it was set to 1 with 3 controllers, but IIUC it should have been set to 5? This may need to set in THT now, instead of by the client, as the client isn't aware of the other node types.

1. https://github.com/openstack/python-tripleoclient/blob/master/tripleoclient/v1/overcloud_deploy.py#L103-L110

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/438545

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/438549

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/438564

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/438545
Committed: https://git.openstack.org/cgit/openstack/puppet-tripleo/commit/?id=52a68ffc8f060e1961458a524e5861cea02d1c1c
Submitter: Jenkins
Branch: master

commit 52a68ffc8f060e1961458a524e5861cea02d1c1c
Author: Brent Eagles <email address hidden>
Date: Fri Feb 24 11:52:11 2017 -0330

    Default neutron dhcp_agents_per_network to number of agents

    This patch will set neutron's dhcp_agents_per_network equal to the
    number of deployed neutron DHCP agents unless otherwise explicitly set.

    Partial-bug: #1632721
    Change-Id: I5533e42c5ba9f72cc70d80489a07e30ee2341198

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/ocata
Review: https://review.openstack.org/441084

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/441084
Committed: https://git.openstack.org/cgit/openstack/puppet-tripleo/commit/?id=4b3ff753717e926a64df0173f1dafab38e41de0b
Submitter: Jenkins
Branch: stable/ocata

commit 4b3ff753717e926a64df0173f1dafab38e41de0b
Author: Brent Eagles <email address hidden>
Date: Fri Feb 24 11:52:11 2017 -0330

    Default neutron dhcp_agents_per_network to number of agents

    This patch will set neutron's dhcp_agents_per_network equal to the
    number of deployed neutron DHCP agents unless otherwise explicitly set.

    Conflicts:
     manifests/profile/base/neutron.pp

    Note: spec/classes/tripleo_profile_base_neutron_spec.rb removed from
    backport as it required defining the neutron class as a precondition to
    satisfy a requirement for a rabbit password. This leads to a duplicate
    definition.

    Partial-bug: #1632721
    Change-Id: I5533e42c5ba9f72cc70d80489a07e30ee2341198
    (cherry picked from commit 52a68ffc8f060e1961458a524e5861cea02d1c1c)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/438549
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=3c5345fc75da1e289929ef5caf08a0f75f904bb4
Submitter: Jenkins
Branch: master

commit 3c5345fc75da1e289929ef5caf08a0f75f904bb4
Author: Brent Eagles <email address hidden>
Date: Mon Feb 27 11:42:20 2017 -0330

    Make neutron dhcp agents per network conditional

    While the heat templates specify a default value of 3, it rarely seems
    to have an effect as the tripleoclient is setting this according to the
    controller scale. This was fine before composable roles, but it is now
    invalid. While the client needs to be modified to no longer set this
    according to controller scale, the template should default to a sentinel
    value that will allow the puppet code to determine the proper value by
    the number of hosts that have the neutron dhcp agent deployed on them.

    Depends-On: I5533e42c5ba9f72cc70d80489a07e30ee2341198
    Partial-bug: #1632721
    Change-Id: I06628764c4769d91bbc42efe1c722702d6574d02

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/438564
Committed: https://git.openstack.org/cgit/openstack/python-tripleoclient/commit/?id=1051880e92a46a508bc92da01f4beb7a9203525b
Submitter: Jenkins
Branch: master

commit 1051880e92a46a508bc92da01f4beb7a9203525b
Author: Brent Eagles <email address hidden>
Date: Mon Feb 27 12:06:48 2017 -0330

    Remove calculation for NeutronDhcpAgentsPerNetwork

    This patch removes the calculation that set the
    NeutronDhcpAgentsPerNetwork configuration based on the number of
    "controllers" being deployed. With composable roles, this is incorrect
    and the default, if required, should be determined by the number of
    neutron dhcp agent services being deployed - not a role count.

    Closes-Bug: #1632721
    Depends-On: I06628764c4769d91bbc42efe1c722702d6574d02
    Change-Id: If202a8255f8ad9f662f0d66a5f630f1b7ae60a26

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/ocata
Review: https://review.openstack.org/442022

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/ocata
Review: https://review.openstack.org/442024

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/442024
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=9c91720199242174151b5d01803785e8266a4db7
Submitter: Jenkins
Branch: stable/ocata

commit 9c91720199242174151b5d01803785e8266a4db7
Author: Brent Eagles <email address hidden>
Date: Mon Feb 27 11:42:20 2017 -0330

    Make neutron dhcp agents per network conditional

    While the heat templates specify a default value of 3, it rarely seems
    to have an effect as the tripleoclient is setting this according to the
    controller scale. This was fine before composable roles, but it is now
    invalid. While the client needs to be modified to no longer set this
    according to controller scale, the template should default to a sentinel
    value that will allow the puppet code to determine the proper value by
    the number of hosts that have the neutron dhcp agent deployed on them.

    Depends-On: I5533e42c5ba9f72cc70d80489a07e30ee2341198
    Partial-bug: #1632721
    Change-Id: I06628764c4769d91bbc42efe1c722702d6574d02
    (cherry picked from commit 3c5345fc75da1e289929ef5caf08a0f75f904bb4)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/442022
Committed: https://git.openstack.org/cgit/openstack/python-tripleoclient/commit/?id=4a5fb3810ee23b59f10ee87251c6149b761c9daa
Submitter: Jenkins
Branch: stable/ocata

commit 4a5fb3810ee23b59f10ee87251c6149b761c9daa
Author: Brent Eagles <email address hidden>
Date: Mon Feb 27 12:06:48 2017 -0330

    Remove calculation for NeutronDhcpAgentsPerNetwork

    This patch removes the calculation that set the
    NeutronDhcpAgentsPerNetwork configuration based on the number of
    "controllers" being deployed. With composable roles, this is incorrect
    and the default, if required, should be determined by the number of
    neutron dhcp agent services being deployed - not a role count.

    Closes-Bug: #1632721
    Depends-On: I06628764c4769d91bbc42efe1c722702d6574d02
    Change-Id: If202a8255f8ad9f662f0d66a5f630f1b7ae60a26
    (cherry picked from commit 1051880e92a46a508bc92da01f4beb7a9203525b)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/python-tripleoclient 7.0.0 release.

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/python-tripleoclient 6.2.0 release.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/newton
Review: https://review.openstack.org/479970

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/newton
Review: https://review.openstack.org/479971

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/479970
Committed: https://git.openstack.org/cgit/openstack/puppet-tripleo/commit/?id=d1d38fb26a632b1a7adddc2f2d58bb7649efcfc6
Submitter: Jenkins
Branch: stable/newton

commit d1d38fb26a632b1a7adddc2f2d58bb7649efcfc6
Author: Brent Eagles <email address hidden>
Date: Fri Feb 24 11:52:11 2017 -0330

    Default neutron dhcp_agents_per_network to number of agents

    This patch will set neutron's dhcp_agents_per_network equal to the
    number of deployed neutron DHCP agents unless otherwise explicitly set.

    Conflicts:
     manifests/profile/base/neutron.pp

    Note: spec/classes/tripleo_profile_base_neutron_spec.rb removed from
    backport as it required defining the neutron class as a precondition to
    satisfy a requirement for a rabbit password. This leads to a duplicate
    definition.

    Partial-bug: #1632721
    Change-Id: I5533e42c5ba9f72cc70d80489a07e30ee2341198
    (cherry picked from commit 52a68ffc8f060e1961458a524e5861cea02d1c1c)
    (cherry picked from commit 4b3ff753717e926a64df0173f1dafab38e41de0b)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/479971
Committed: https://git.openstack.org/cgit/openstack/python-tripleoclient/commit/?id=153972c4080bef87bfff2563e0b5b331dd29fe26
Submitter: Jenkins
Branch: stable/newton

commit 153972c4080bef87bfff2563e0b5b331dd29fe26
Author: Brent Eagles <email address hidden>
Date: Mon Feb 27 12:06:48 2017 -0330

    Remove calculation for NeutronDhcpAgentsPerNetwork

    This patch removes the calculation that set the
    NeutronDhcpAgentsPerNetwork configuration based on the number of
    "controllers" being deployed. With composable roles, this is incorrect
    and the default, if required, should be determined by the number of
    neutron dhcp agent services being deployed - not a role count.

    Closes-Bug: #1632721
    Depends-On: I06628764c4769d91bbc42efe1c722702d6574d02
    Change-Id: If202a8255f8ad9f662f0d66a5f630f1b7ae60a26
    (cherry picked from commit 1051880e92a46a508bc92da01f4beb7a9203525b)
    (cherry picked from commit 4a5fb3810ee23b59f10ee87251c6149b761c9daa)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/python-tripleoclient 5.4.3 release.