Set force_config_drive only when OVNMetadata is disabled

There are usecases when operator wants to talk to metadata API from
config-drive script (e.g. using curl to get data from metadata). That
means it makes sense to have OVN Metadata Agent deployed while forcing
config-drive to be used.

This patch sets force_config_drive to true only when OVNMetadataEnable
is set to false. If it's set to true then it doesn't touch
force_config_drive option, leaving it up to environment to define it.
(The default for force_config_drive is false.)

Closes-Bug: #1830179
Change-Id: Ib956ff2f521b9853c58eaa5500836c692dd9321d
This commit is contained in:
Jakub Libosvar 2019-05-22 13:47:37 +02:00 committed by Harald Jensås
parent aab5feed70
commit 7ac8e67d82
1 changed files with 4 additions and 1 deletions

View File

@ -118,7 +118,6 @@ outputs:
$NETWORK: {get_param: [ServiceNetMap, NeutronTenantNetwork]}
ovn::controller::ovn_bridge: {get_param: OVNIntegrationBridge}
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::ovn_controller::firewall_rules:
'118 neutron vxlan networks':
@ -127,6 +126,10 @@ outputs:
'119 neutron geneve networks':
proto: 'udp'
dport: 6081
- if:
- force_config_drive
- nova::compute::force_config_drive: true
- {}
service_config_settings: {}
# BEGIN DOCKER SETTINGS
puppet_config: