openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Set force_config_drive only when OVNMetadata is disabled"

Browse Source
This commit is contained in:
Zuul 2019-05-23 14:25:23 +00:00 committed by Gerrit Code Review
commit afdd75454f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deployment/ovn/ovn-controller-container-puppet.yaml
View File

@ -118,7 +118,6 @@ outputs:
$NETWORK: {get_param: [ServiceNetMap, NeutronTenantNetwork]} $NETWORK: {get_param: [ServiceNetMap, NeutronTenantNetwork]}
ovn::controller::ovn_bridge: {get_param: OVNIntegrationBridge} ovn::controller::ovn_bridge: {get_param: OVNIntegrationBridge}
ovn::controller::hostname: "%{hiera('fqdn_canonical')}" ovn::controller::hostname: "%{hiera('fqdn_canonical')}"
nova::compute::force_config_drive: {if: [force_config_drive, true, false]}
tripleo::profile::base::neutron::agents::ovn::ovn_db_host: {get_param: [EndpointMap, OvnDbInternal, host_nobrackets]} tripleo::profile::base::neutron::agents::ovn::ovn_db_host: {get_param: [EndpointMap, OvnDbInternal, host_nobrackets]}
tripleo::ovn_controller::firewall_rules: tripleo::ovn_controller::firewall_rules:
'118 neutron vxlan networks': '118 neutron vxlan networks':
@ -127,6 +126,10 @@ outputs:
'119 neutron geneve networks': '119 neutron geneve networks':
proto: 'udp' proto: 'udp'
dport: 6081 dport: 6081
- if:
- force_config_drive
- nova::compute::force_config_drive: true
- {}
service_config_settings: {} service_config_settings: {}
# BEGIN DOCKER SETTINGS # BEGIN DOCKER SETTINGS
puppet_config: puppet_config: