openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Neutron: Explicitly set the default hepervisor name 

... to ensure that the consistent hypervisor name is used in both nova
and neutron.

Change-Id: Ibe2f670872252b177643cb1a06c69010bcba7bb4
Related-Bug: #1926693
Depends-on: https://review.opendev.org/796230
Depends-on: https://review.opendev.org/817406
(cherry picked from commit d96a9c615e)
This commit is contained in:
Takashi Kajinami 2021-06-15 17:24:47 +09:00
parent 235e26f8e4
commit 8cf06c434e
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deployment/neutron/neutron-ovs-agent-container-puppet.yaml
View File

@ -243,6 +243,7 @@ outputs:
neutron::agents::ml2::ovs::extensions: {get_param: NeutronAgentExtensions}
neutron::agents::ml2::ovs::tunnel_csum: {get_param: NeutronOVSTunnelCsum}
neutron::agents::ml2::ovs::igmp_snooping_enable: {get_param: NeutronEnableIgmpSnooping}
neutron::agents::ml2::ovs::resource_provider_default_hypervisor: "%{hiera('fqdn_canonical')}"
# NOTE: bind IP is found in hiera replacing the network name with the
# local node IP for the given network; replacement examples
# (eg. for internal_api):

1
deployment/neutron/neutron-sriov-agent-container-puppet.yaml
View File

@ -143,6 +143,7 @@ outputs:
- get_attr: [NeutronBase, role_data, config_settings]
- get_attr: [RoleParametersValue, value]
- get_attr: [NeutronLogging, config_settings]
- neutron::agents::ml2::sriov::resource_provider_default_hypervisor: "%{hiera('fqdn_canonical')}"
puppet_config:
config_volume: neutron
puppet_tags: neutron_config,neutron_agent_sriov_numvfs,neutron_sriov_agent_config