From ccc3eb2c31fdac7840c6496cf62e78fbc09abdc5 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Tue, 15 May 2018 22:46:53 -0400 Subject: [PATCH] Revert "Specify DHCP domain for hostname" This reverts commit da5ccf7fb72666de47113442eaca7d2efd5fb507. --- pkg/cloudprovider/providers/openstack/openstack.go | 3 --- pkg/cloudprovider/providers/openstack/openstack_instances.go | 4 ---- 2 files changed, 7 deletions(-) diff --git a/pkg/cloudprovider/providers/openstack/openstack.go b/pkg/cloudprovider/providers/openstack/openstack.go index b007a02d542..5f2e6925cbb 100644 --- a/pkg/cloudprovider/providers/openstack/openstack.go +++ b/pkg/cloudprovider/providers/openstack/openstack.go @@ -121,7 +121,6 @@ type RouterOpts struct { type MetadataOpts struct { SearchOrder string `gcfg:"search-order"` RequestTimeout MyDuration `gcfg:"request-timeout"` - DHCPDomain string `gcfg:"dhcp-domain"` } // OpenStack is an implementation of cloud provider Interface for OpenStack. @@ -234,7 +233,6 @@ func configFromEnv() (cfg Config, ok bool) { cfg.Global.TrustID != "") cfg.Metadata.SearchOrder = fmt.Sprintf("%s,%s", configDriveID, metadataID) - cfg.Metadata.DHCPDomain = "novalocal" cfg.BlockStorage.BSVersion = "auto" return @@ -252,7 +250,6 @@ func readConfig(config io.Reader) (Config, error) { cfg.BlockStorage.TrustDevicePath = false cfg.BlockStorage.IgnoreVolumeAZ = false cfg.Metadata.SearchOrder = fmt.Sprintf("%s,%s", configDriveID, metadataID) - cfg.Metadata.DHCPDomain = "novalocal" err := gcfg.ReadInto(&cfg, config) return cfg, err diff --git a/pkg/cloudprovider/providers/openstack/openstack_instances.go b/pkg/cloudprovider/providers/openstack/openstack_instances.go index f23fead5c0e..0cf1a9a6dd6 100644 --- a/pkg/cloudprovider/providers/openstack/openstack_instances.go +++ b/pkg/cloudprovider/providers/openstack/openstack_instances.go @@ -62,10 +62,6 @@ func (i *Instances) CurrentNodeName(ctx context.Context, hostname string) (types if err != nil { return "", err } - domain := "." + i.opts.DHCPDomain - if i.opts.DHCPDomain != "" && strings.HasSuffix(md.Hostname, domain) { - return types.NodeName(strings.TrimSuffix(md.Hostname, domain)), nil - } return types.NodeName(strings.Split(md.Hostname, ".")[0]), nil }