Skip to content

Commit 3f69a6d

Browse files
Deploy 3 node cluster
1 parent e225092 commit 3f69a6d

File tree

4 files changed

+27
-14
lines changed

4 files changed

+27
-14
lines changed

deps/rabbitmq_management/selenium/bin/components/rabbit-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ networks:
77
services:
88
rmq0: &rabbitmq
99
# https://hub.docker.com/r/pivotalrabbitmq/rabbitmq-prometheus/tags
10-
image: rabbitmq:1.13
10+
<< : *rabbitmq_image
1111
networks:
1212
- "rabbitmq_net"
1313
ports:
@@ -22,7 +22,7 @@ services:
2222
hostname: rmq0
2323
environment:
2424
RABBITMQ_ERLANG_COOKIE: rmq0
25-
<< : *rabbitmq_volumes
25+
2626
# we want to simulate hitting thresholds
2727
ulimits:
2828
nofile:

deps/rabbitmq_management/selenium/bin/components/rabbitmq

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ start_local_rabbitmq() {
5454
start_docker_cluster_rabbitmq() {
5555
begin "Starting rabbitmq cluster in docker ..."
5656
init_rabbitmq
57-
kill_container_if_exist rmq0
58-
kill_container_if_exist rmq1
59-
kill_container_if_exist rmq2
57+
kill_container_if_exist rabbitmq-rmq0-1
58+
kill_container_if_exist rabbitmq-rmq1-1
59+
kill_container_if_exist rabbitmq-rmq2-1
6060

6161
mkdir -p $CONF_DIR/rabbitmq
6262
MOUNT_RABBITMQ_CONF="/etc/rabbitmq/rabbitmq.conf"
@@ -67,8 +67,11 @@ start_docker_cluster_rabbitmq() {
6767
${BIN_DIR}/gen-advanced-config ${RABBITMQ_CONFIG_DIR} $ENV_FILE /$CONF_DIR/rabbitmq/advanced.config
6868
RESULT=$?
6969
if [ $RESULT -eq 0 ]; then
70-
print "> EFFECTIVE ADVANCED_CONFIG_FILE: $CONF_DIR/rabbitmq/advanced.config"
71-
EXTRA_MOUNTS="-v $CONF_DIR/rabbitmq/advanced.config:${MOUNT_ADVANCED_CONFIG}:ro "
70+
if [ -s $RESULT ]; then
71+
print "> EFFECTIVE ADVANCED_CONFIG_FILE: $CONF_DIR/rabbitmq/advanced.config"
72+
else
73+
rm $CONF_DIR/rabbitmq/advanced.config
74+
fi
7275
fi
7376
mkdir -p $CONF_DIR/rabbitmq/conf.d/
7477
cp ${RABBITMQ_CONFIG_DIR}/logging.conf $CONF_DIR/rabbitmq/conf.d/
@@ -79,19 +82,26 @@ start_docker_cluster_rabbitmq() {
7982
cp -r ${RABBITMQ_CONFIG_DIR}/certs $CONF_DIR/rabbitmq
8083
fi
8184
if [ -d ${RABBITMQ_CONFIG_DIR}/imports ]; then
82-
cp -r ${RABBITMQ_CONFIG_DIR}/certs $CONF_DIR/rabbitmq
85+
cp -r ${RABBITMQ_CONFIG_DIR}/imports $CONF_DIR/rabbitmq
8386
fi
8487

85-
cat > $CONF_DIR/rabbitmq/compose.yml <<EOF
86-
x-rabbitmq_volumes: &rabbitmq_volumes
87-
- $CONF_DIR/rabbitmq/:/etc/rabbitmq
88-
- $CONF_DIR/rabbitmq/:/var/rabbitmq
88+
cat > $CONF_DIR/rabbitmq/image_compose.yml <<EOF
89+
x-rabbitmq_image: &rabbitmq_image
90+
image: ${RABBITMQ_DOCKER_IMAGE}
91+
volumes:
92+
- $CONF_DIR/rabbitmq/:/etc/rabbitmq
93+
- $CONF_DIR/rabbitmq/:/var/rabbitmq
8994
EOF
95+
cat $CONF_DIR/rabbitmq/image_compose.yml > $CONF_DIR/rabbitmq/compose.yml
9096
cat ${BIN_DIR}/components/rabbit-compose.yml >> $CONF_DIR/rabbitmq/compose.yml
9197

92-
print "Generated docker compose "
93-
cat $CONF_DIR/rabbitmq/compose.yml
98+
docker-compose -f $CONF_DIR/rabbitmq/compose.yml \
99+
up -d
94100

101+
wait_for_message rabbitmq-rmq0-1 "Server startup complete"
102+
wait_for_message rabbitmq-rmq1-1 "Server startup complete"
103+
wait_for_message rabbitmq-rmq2-1 "Server startup complete"
104+
end "RabbitMQ ready"
95105
}
96106

97107
start_docker_rabbitmq() {

deps/rabbitmq_management/selenium/bin/gen-advanced-config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,6 @@ then
2828
fi
2929
if [ "$FOUND_TEMPLATES_COUNT" -lt 1 ]
3030
then
31+
rm $FINAL_CONFIG_FILE
3132
exit -1
3233
fi

deps/rabbitmq_management/selenium/bin/suite_template

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ SCREENS=${SELENIUM_ROOT_FOLDER}/screens/${SUITE}
3232
CONF_DIR=/tmp/selenium/${SUITE}
3333
ENV_FILE=$CONF_DIR/.env
3434

35+
rm -r $CONF_DIR
36+
3537
for f in $SCRIPT/components/*; do
3638
if [[ ! "$f" == *README.md ]]
3739
then

0 commit comments

Comments
 (0)