From 13516ca3d6f967cda8ff8077a3b42acb8fb7aef7 Mon Sep 17 00:00:00 2001 From: Sergiusz Urbaniak Date: Tue, 21 Feb 2017 15:07:54 +0100 Subject: [PATCH] openstack: fix dispatcher Currently the dispatcher func always performs fetching from config drive, but never from a metadata service. This fixes it. --- internal/providers/openstack/openstack.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/providers/openstack/openstack.go b/internal/providers/openstack/openstack.go index 965bd04ee..cff23739c 100644 --- a/internal/providers/openstack/openstack.go +++ b/internal/providers/openstack/openstack.go @@ -56,7 +56,7 @@ func FetchConfig(logger *log.Logger, client *resource.HttpClient) (types.Config, ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) dispatch := func(name string, fn func() ([]byte, error)) { - raw, err := fetchConfigFromConfigDrive(logger, ctx) + raw, err := fn() if err != nil { switch err { case context.Canceled: @@ -75,6 +75,7 @@ func FetchConfig(logger *log.Logger, client *resource.HttpClient) (types.Config, go dispatch("config drive", func() ([]byte, error) { return fetchConfigFromConfigDrive(logger, ctx) }) + go dispatch("metadata service", func() ([]byte, error) { return fetchConfigFromMetadataService(logger, client, ctx) })