From ccc3eb2c31fdac7840c6496cf62e78fbc09abdc5 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Tue, 15 May 2018 22:46:53 -0400 Subject: [PATCH 1/3] 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 } From 2f48ad3ff5b31261e31b11c94ac203169405393a Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Tue, 15 May 2018 22:47:02 -0400 Subject: [PATCH 2/3] Revert "Split out the hostname when default dhcp_domain is used in nova.conf" This reverts commit 9a8c6db448f200ddd9a06813affab804b183de20. --- pkg/cloudprovider/providers/openstack/openstack_instances.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/cloudprovider/providers/openstack/openstack_instances.go b/pkg/cloudprovider/providers/openstack/openstack_instances.go index 0cf1a9a6dd6..d852ccb27a2 100644 --- a/pkg/cloudprovider/providers/openstack/openstack_instances.go +++ b/pkg/cloudprovider/providers/openstack/openstack_instances.go @@ -20,7 +20,6 @@ import ( "context" "fmt" "regexp" - "strings" "github.com/golang/glog" "github.com/gophercloud/gophercloud" @@ -62,7 +61,7 @@ func (i *Instances) CurrentNodeName(ctx context.Context, hostname string) (types if err != nil { return "", err } - return types.NodeName(strings.Split(md.Hostname, ".")[0]), nil + return types.NodeName(md.Hostname), nil } // AddSSHKeyToAllInstances is not implemented for OpenStack From 6ab76041b7845af6de51752434e317b52e6ba24c Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Tue, 15 May 2018 22:49:21 -0400 Subject: [PATCH 3/3] Revert "Openstack: register metadata.hostname as node name" This reverts commit eaac0f5489de823f9e5805c53855560ae1a64156. --- pkg/cloudprovider/providers/openstack/metadata.go | 2 +- pkg/cloudprovider/providers/openstack/metadata_test.go | 6 +++--- .../providers/openstack/openstack_instances.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/cloudprovider/providers/openstack/metadata.go b/pkg/cloudprovider/providers/openstack/metadata.go index a69b3d81763..6ef8eb98d85 100644 --- a/pkg/cloudprovider/providers/openstack/metadata.go +++ b/pkg/cloudprovider/providers/openstack/metadata.go @@ -70,7 +70,7 @@ type DeviceMetadata struct { // See http://docs.openstack.org/user-guide/cli_config_drive.html type Metadata struct { UUID string `json:"uuid"` - Hostname string `json:"hostname"` + Name string `json:"name"` AvailabilityZone string `json:"availability_zone"` Devices []DeviceMetadata `json:"devices,omitempty"` // .. and other fields we don't care about. Expand as necessary. diff --git a/pkg/cloudprovider/providers/openstack/metadata_test.go b/pkg/cloudprovider/providers/openstack/metadata_test.go index 53bd9532b5f..53a0da250dd 100644 --- a/pkg/cloudprovider/providers/openstack/metadata_test.go +++ b/pkg/cloudprovider/providers/openstack/metadata_test.go @@ -23,7 +23,7 @@ import ( var FakeMetadata = Metadata{ UUID: "83679162-1378-4288-a2d4-70e13ec132aa", - Hostname: "test", + Name: "test", AvailabilityZone: "nova", } @@ -81,8 +81,8 @@ func TestParseMetadata(t *testing.T) { t.Fatalf("Should succeed when provided with valid data: %s", err) } - if md.Hostname != "test.novalocal" { - t.Errorf("incorrect hostname: %s", md.Hostname) + if md.Name != "test" { + t.Errorf("incorrect name: %s", md.Name) } if md.UUID != "83679162-1378-4288-a2d4-70e13ec132aa" { diff --git a/pkg/cloudprovider/providers/openstack/openstack_instances.go b/pkg/cloudprovider/providers/openstack/openstack_instances.go index d852ccb27a2..638b78508d8 100644 --- a/pkg/cloudprovider/providers/openstack/openstack_instances.go +++ b/pkg/cloudprovider/providers/openstack/openstack_instances.go @@ -61,7 +61,7 @@ func (i *Instances) CurrentNodeName(ctx context.Context, hostname string) (types if err != nil { return "", err } - return types.NodeName(md.Hostname), nil + return types.NodeName(md.Name), nil } // AddSSHKeyToAllInstances is not implemented for OpenStack