Merge "Revert "Also set nova::network::neutron::dhcp_domain""

This commit is contained in:
Zuul 2019-07-19 10:57:59 +00:00 committed by Gerrit Code Review
commit 55367ac0f5

View File

@ -302,7 +302,6 @@ outputs:
nova::network::neutron::neutron_username: 'neutron'
nova::network::neutron::neutron_region_name: {get_param: KeystoneRegion}
nova::metadata::dhcp_domain: ''
nova::network::neutron::dhcp_domain: ''
nova::network::neutron::neutron_password: {get_param: NeutronPassword}
nova::network::neutron::neutron_auth_url: {get_param: [EndpointMap, KeystoneV3Internal, uri]}
nova::rabbit_heartbeat_timeout_threshold: 60