From 29aed4d33ae539f6f05bb5b0035ad3271dd6a3db Mon Sep 17 00:00:00 2001 From: Martin Schuppert Date: Fri, 5 Jul 2019 06:53:22 +0000 Subject: [PATCH] Revert "Also set nova::network::neutron::dhcp_domain" This reverts commit 12aaf4b54c7dfe2e5e3044882af78bb340a5d63c. Change-Id: I8b797d402657d18669f6c3c28d822605ce7e1035 --- deployment/nova/nova-base-puppet.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/deployment/nova/nova-base-puppet.yaml b/deployment/nova/nova-base-puppet.yaml index b40b946049..47b3081463 100644 --- a/deployment/nova/nova-base-puppet.yaml +++ b/deployment/nova/nova-base-puppet.yaml @@ -320,7 +320,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