update parse 4xx responses from instance metadata service

1 files changed, 5 insertions, 3 deletions

diff --git a/deps/rabbitmq_peer_discovery_aws/src/rabbit_peer_discovery_aws.erl b/deps/rabbitmq_peer_discovery_aws/src/rabbit_peer_discovery_aws.erl
index f1e83638c3..d1a8e8a529 100644
--- a/deps/rabbitmq_peer_discovery_aws/src/rabbit_peer_discovery_aws.erl
+++ b/deps/rabbitmq_peer_discovery_aws/src/rabbit_peer_discovery_aws.erl
@@ -87,9 +87,11 @@ list_nodes() ->
                                get_config_key(aws_secret_key, M)),
     case get_config_key(aws_autoscaling, M) of
         true ->
-            {ok, InstanceId} = rabbitmq_aws_config:instance_id(),
-            rabbit_log:debug("EC2 instance ID is determined from metadata service: ~p", [InstanceId]),
-            get_autoscaling_group_node_list(InstanceId, get_tags());
+            case rabbitmq_aws_config:instance_id() of
+                {ok, InstanceId} -> rabbit_log:debug("EC2 instance ID is determined from metadata service: ~p", [InstanceId]),
+                                    get_autoscaling_group_node_list(InstanceId, get_tags());
+                _                -> {error, "Failed to determined EC2 instance ID from metadata service"}
+            end;
         false ->
             get_node_list_from_tags(get_tags())
     end.