openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Use short prameter names for nova::network::neutron 

Depends-on: https://review.opendev.org/#/c/709371
Change-Id: If8a3d0a6db1b2950191ab62bdcfd7d2f12935de1
This commit is contained in:
Takashi Kajinami 2020-02-24 21:47:35 +09:00
parent 38a95f12b1
commit b7ee703964
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deployment/nova/nova-base-puppet.yaml
View File

@ -358,26 +358,26 @@ outputs:
- {get_param: Debug }
- {get_param: NovaDebug }
nova::purge_config: {get_param: EnableConfigPurge}
nova::network::neutron::neutron_project_name: 'service'
nova::network::neutron::neutron_username: 'neutron'
nova::network::neutron::neutron_region_name: {get_param: KeystoneRegion}
nova::network::neutron::project_name: 'service'
nova::network::neutron::username: 'neutron'
nova::network::neutron::region_name: {get_param: KeystoneRegion}
nova::metadata::dhcp_domain: ''
nova::network::neutron::neutron_password: {get_param: NeutronPassword}
nova::network::neutron::neutron_auth_url: {get_param: [EndpointMap, KeystoneV3Internal, uri]}
nova::network::neutron::password: {get_param: NeutronPassword}
nova::network::neutron::auth_url: {get_param: [EndpointMap, KeystoneV3Internal, uri]}
nova::rabbit_heartbeat_timeout_threshold: 60
nova::cinder_catalog_info: 'volumev3:cinderv3:internalURL'
nova::host: "%{hiera('fqdn_canonical')}"
nova::notify_on_state_change: 'vm_and_task_state'
nova::notification_driver: {get_param: NotificationDriver}
nova::notification_format: 'unversioned'
nova::network::neutron::neutron_auth_type: 'v3password'
nova::network::neutron::auth_type: 'v3password'
nova::db::database_db_max_retries: -1
nova::db::database_max_retries: -1
nova::db::sync::db_sync_timeout: {get_param: DatabaseSyncTimeout}
nova::db::sync_api::db_sync_timeout: {get_param: DatabaseSyncTimeout}
nova::glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]}
nova::use_ipv6: {get_param: NovaIPv6}
nova::network::neutron::neutron_ovs_bridge: {get_param: NovaOVSBridge}
nova::network::neutron::ovs_bridge: {get_param: NovaOVSBridge}
nova::cron::archive_deleted_rows::minute: {get_param: NovaCronArchiveDeleteRowsMinute}
nova::cron::archive_deleted_rows::hour: {get_param: NovaCronArchiveDeleteRowsHour}
nova::cron::archive_deleted_rows::monthday: {get_param: NovaCronArchiveDeleteRowsMonthday}

2
environments/low-memory-usage.yaml
View File

@ -17,7 +17,7 @@ parameter_defaults:
ApacheServerLimit: 100
ControllerExtraConfig:
'nova::network::neutron::neutron_timeout': '60'
'nova::network::neutron::timeout': '60'
DatabaseSyncTimeout: 900