Merge "Set toplevel nova::dhcp_domain for all nova services" into stable/train
This commit is contained in:
commit
7befdd2f6e
|
@ -292,7 +292,7 @@ outputs:
|
||||||
nova::network::neutron::neutron_project_name: 'service'
|
nova::network::neutron::neutron_project_name: 'service'
|
||||||
nova::network::neutron::neutron_username: 'neutron'
|
nova::network::neutron::neutron_username: 'neutron'
|
||||||
nova::network::neutron::neutron_region_name: {get_param: KeystoneRegion}
|
nova::network::neutron::neutron_region_name: {get_param: KeystoneRegion}
|
||||||
nova::metadata::dhcp_domain: ''
|
nova::dhcp_domain: ''
|
||||||
nova::network::neutron::neutron_password: {get_param: NeutronPassword}
|
nova::network::neutron::neutron_password: {get_param: NeutronPassword}
|
||||||
nova::network::neutron::neutron_auth_url: {get_param: [EndpointMap, KeystoneV3Internal, uri]}
|
nova::network::neutron::neutron_auth_url: {get_param: [EndpointMap, KeystoneV3Internal, uri]}
|
||||||
nova::rabbit_heartbeat_timeout_threshold: 60
|
nova::rabbit_heartbeat_timeout_threshold: 60
|
||||||
|
|
Loading…
Reference in New Issue