unistack-org/cloudinit
3
0
Fork 0
Code Issues1 Pull Requests Packages Projects Releases Wiki Activity

ec2: allow spaces seperated hostname in metadata

Browse Source 
AWS hostname metadata will return space seperated hostname and domain
names when DHCPOptionSet is using multiple domain names. This patch will
cater for this scenario.
This commit is contained in:
Kevin Yung 2015-01-02 11:38:37 +11:00
parent 54c62cbb70
commit 13e4b77130
2 changed files with 15 additions and 1 deletions
datasource/metadata/ec2
metadata.gometadata_test.go

2
datasource/metadata/ec2/metadata.go

@ -69,7 +69,7 @@ func (ms metadataService) FetchMetadata() ([]byte, error) {
}
if hostname, err := ms.fetchAttribute(fmt.Sprintf("%s/hostname", ms.MetadataUrl())); err == nil {
attrs["hostname"] = hostname
attrs["hostname"] = strings.Split(hostname, " ")[0]
} else if _, ok := err.(pkg.ErrNotFound); !ok {
return nil, err
}

14
datasource/metadata/ec2/metadata_test.go

@ -173,6 +173,20 @@ func TestFetchMetadata(t *testing.T) {
},
expect: []byte(`{"hostname":"host","local-ipv4":"1.2.3.4","network_config":{"content_path":"path"},"public-ipv4":"5.6.7.8","public_keys":{"test1":"key"}}`),
},
{
root: "/",
metadataPath: "2009-04-04/meta-data",
resources: map[string]string{
"/2009-04-04/meta-data/hostname": "host domain another_domain",
"/2009-04-04/meta-data/local-ipv4": "1.2.3.4",
"/2009-04-04/meta-data/public-ipv4": "5.6.7.8",
"/2009-04-04/meta-data/public-keys": "0=test1\n",
"/2009-04-04/meta-data/public-keys/0": "openssh-key",
"/2009-04-04/meta-data/public-keys/0/openssh-key": "key",
"/2009-04-04/meta-data/network_config/content_path": "path",
},
expect: []byte(`{"hostname":"host","local-ipv4":"1.2.3.4","network_config":{"content_path":"path"},"public-ipv4":"5.6.7.8","public_keys":{"test1":"key"}}`),
},
{
clientErr: pkg.ErrTimeout{Err: fmt.Errorf("test error")},
expectErr: pkg.ErrTimeout{Err: fmt.Errorf("test error")},