diff options
| author | Philip Kuryloski <kuryloskip@vmware.com> | 2021-07-28 10:19:11 +0200 |
|---|---|---|
| committer | Philip Kuryloski <kuryloskip@vmware.com> | 2021-07-28 10:19:11 +0200 |
| commit | a0a5bf3c0126075048d823d39a45ee741191cedd (patch) | |
| tree | 84254c8207e28dc9150286893254c856938ce0f7 /deps/rabbitmq_peer_discovery_aws | |
| parent | 81ad77e120c8d23132485771119c097c22bf3e28 (diff) | |
| download | rabbitmq-server-git-a0a5bf3c0126075048d823d39a45ee741191cedd.tar.gz | |
Update peer discovery aws tests for docker image changes
Diffstat (limited to 'deps/rabbitmq_peer_discovery_aws')
| -rw-r--r-- | deps/rabbitmq_peer_discovery_aws/test/integration_SUITE.erl | 14 | ||||
| -rw-r--r-- | deps/rabbitmq_peer_discovery_aws/test/integration_SUITE_data/task_definition.json | 8 |
2 files changed, 9 insertions, 13 deletions
diff --git a/deps/rabbitmq_peer_discovery_aws/test/integration_SUITE.erl b/deps/rabbitmq_peer_discovery_aws/test/integration_SUITE.erl index f379ead635..cbd356ed6a 100644 --- a/deps/rabbitmq_peer_discovery_aws/test/integration_SUITE.erl +++ b/deps/rabbitmq_peer_discovery_aws/test/integration_SUITE.erl @@ -124,7 +124,11 @@ cluster_was_formed(Config) -> ?assertEqual(lists:sort(N2Nodes), lists:sort(N3Nodes)). register_tagged_task(Config) -> + RabbitmqDefaultUser = ?config(rabbitmq_default_user, Config), + RabbitmqDefaultPass = ?config(rabbitmq_default_pass, Config), RabbitmqConf = string:join([ + "default_user = " ++ RabbitmqDefaultUser, + "default_pass = " ++ RabbitmqDefaultPass, "cluster_formation.peer_discovery_backend = aws", "cluster_formation.aws.instance_tags.service = rabbitmq", "" @@ -133,7 +137,11 @@ register_tagged_task(Config) -> aws_ecs_util:register_task(Config, TaskJson). register_autoscaled_task(Config) -> + RabbitmqDefaultUser = ?config(rabbitmq_default_user, Config), + RabbitmqDefaultPass = ?config(rabbitmq_default_pass, Config), RabbitmqConf = string:join([ + "default_user = " ++ RabbitmqDefaultUser, + "default_pass = " ++ RabbitmqDefaultPass, "cluster_formation.peer_discovery_backend = aws", "cluster_formation.aws.use_autoscaling_group = true", "" @@ -156,11 +164,7 @@ task_json(Config, RabbitmqConf) -> RabbitContainerDef1 = RabbitContainerDef#{ <<"image">> := list_to_binary(RabbitmqImage), - <<"environment">> := [#{<<"name">> => <<"RABBITMQ_DEFAULT_USER">>, - <<"value">> => list_to_binary(RabbitmqDefaultUser)}, - #{<<"name">> => <<"RABBITMQ_DEFAULT_PASS">>, - <<"value">> => list_to_binary(RabbitmqDefaultPass)}, - #{<<"name">> => <<"RABBITMQ_ERLANG_COOKIE">>, + <<"environment">> := [#{<<"name">> => <<"RABBITMQ_ERLANG_COOKIE">>, <<"value">> => list_to_binary(RabbitmqErlangCookie)}] }, SidecarContainerDef1 = diff --git a/deps/rabbitmq_peer_discovery_aws/test/integration_SUITE_data/task_definition.json b/deps/rabbitmq_peer_discovery_aws/test/integration_SUITE_data/task_definition.json index b834b19825..354f6a1e2b 100644 --- a/deps/rabbitmq_peer_discovery_aws/test/integration_SUITE_data/task_definition.json +++ b/deps/rabbitmq_peer_discovery_aws/test/integration_SUITE_data/task_definition.json @@ -22,14 +22,6 @@ "essential": true, "environment": [ { - "name": "RABBITMQ_DEFAULT_USER", - "value": "PLACEHOLDER" - }, - { - "name": "RABBITMQ_DEFAULT_PASS", - "value": "PLACEHOLDER" - }, - { "name": "RABBITMQ_ERLANG_COOKIE", "value": "PLACEHOLDER" } |