Merge "Configure nova_compute for vendordata"

This commit is contained in:
Zuul 2019-05-18 00:42:41 +00:00 committed by Gerrit Code Review
commit 2f1ec04ad4

View File

@ -121,7 +121,7 @@ outputs:
nova::metadata::novajoin::auth::tenant: 'service' nova::metadata::novajoin::auth::tenant: 'service'
nova::metadata::novajoin::auth::password: {get_param: NovajoinPassword} nova::metadata::novajoin::auth::password: {get_param: NovajoinPassword}
nova::metadata::novajoin::auth::region: {get_param: KeystoneRegion} nova::metadata::novajoin::auth::region: {get_param: KeystoneRegion}
nova_metadata: nova_metadata: &nova_vendordata
novajoin_address: novajoin_address:
str_replace: str_replace:
template: template:
@ -152,6 +152,9 @@ outputs:
nova::vendordata::vendordata_dynamic_read_timeout: {get_param: NovajoinVendordataTimeout} nova::vendordata::vendordata_dynamic_read_timeout: {get_param: NovajoinVendordataTimeout}
nova::notification_topics: ['notifications', 'novajoin_notifications'] nova::notification_topics: ['notifications', 'novajoin_notifications']
nova::notify_on_state_change: 'vm_state' nova::notify_on_state_change: 'vm_state'
nova_api: *nova_vendordata
nova_compute: *nova_vendordata
nova_ironic: *nova_vendordata
# BEGIN DOCKER SETTINGS # BEGIN DOCKER SETTINGS
puppet_config: puppet_config:
config_volume: novajoin config_volume: novajoin