Merge pull request #66 from detiber/add-local-hostname

Add local-hostname to metadata
tinkerbell · Sep 21, 2021 · 89cb9dc · 89cb9dc
2 parents 2b42541 + 6c0ade5
commit 89cb9dc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/http-server/http_handlers.go b/http-server/http_handlers.go
@@ -27,9 +27,10 @@ var (
 	ec2Filters = map[string]string{
 		"":                                    `"meta-data", "user-data"`, // base path
 		"/user-data":                          ".metadata.userdata",
-		"/meta-data":                          `["instance-id", "hostname", "iqn", "plan", "facility", "tags", "operating-system", "public-keys", "public-ipv4", "public-ipv6", "local-ipv4"] + (if .metadata.instance.spot != null then ["spot"] else [] end) | sort | .[]`,
+		"/meta-data":                          `["instance-id", "hostname", "local-hostname", "iqn", "plan", "facility", "tags", "operating-system", "public-keys", "public-ipv4", "public-ipv6", "local-ipv4"] + (if .metadata.instance.spot != null then ["spot"] else [] end) | sort | .[]`,
 		"/meta-data/instance-id":              ".metadata.instance.id",
 		"/meta-data/hostname":                 ".metadata.instance.hostname",
+		"/meta-data/local-hostname":           ".metadata.instance.hostname",
 		"/meta-data/iqn":                      ".metadata.instance.iqn",
 		"/meta-data/plan":                     ".metadata.instance.plan",
 		"/meta-data/facility":                 ".metadata.instance.facility",

diff --git a/http-server/http_server_test.go b/http-server/http_server_test.go
@@ -662,6 +662,7 @@ echo "Hello world!"`,
 hostname
 instance-id
 iqn
+local-hostname
 local-ipv4
 operating-system
 plan
@@ -747,6 +748,7 @@ user-data`,
 hostname
 instance-id
 iqn
+local-hostname
 local-ipv4
 operating-system
 plan
@@ -809,6 +811,7 @@ version`,
 hostname
 instance-id
 iqn
+local-hostname
 local-ipv4
 operating-system
 plan