summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2018-03-29 22:56:45 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-29 22:56:45 +0000
commitbc9d71d2d272999fe4fc446dbcf6c81aae782a98 (patch)
treee56ccbd2a64d38bd088c3ab74d7d3ab6e9eeaf10
parentf19016b39b828f648a66adc305cce17f5146e922 (diff)
parent18546b4f43b9c927c4c91529dd912c7368b941bf (diff)
Merge "Fix RabbitMQ service installation and initialization"
-rwxr-xr-xdocker/supervisor.sh3
-rwxr-xr-xinstall.sh7
2 files changed, 7 insertions, 3 deletions
diff --git a/docker/supervisor.sh b/docker/supervisor.sh
index b67de2212..1e54b4164 100755
--- a/docker/supervisor.sh
+++ b/docker/supervisor.sh
@@ -24,3 +24,6 @@ directory = /etc/yardstick
command = uwsgi -i yardstick.ini
EOF
fi
+
+[program:rabbitmq]
+command = service rabbitmq-server restart
diff --git a/install.sh b/install.sh
index 6f4ab8c9d..04985f48a 100755
--- a/install.sh
+++ b/install.sh
@@ -84,7 +84,7 @@ apt-get update && apt-get install -y \
libxft-dev \
libxss-dev \
sudo \
- iputils-ping
+ iputils-ping \
rabbitmq-server
if [[ "${DOCKER_ARCH}" != "aarch64" ]]; then
@@ -95,10 +95,11 @@ apt-get -y autoremove && apt-get clean
git config --global http.sslVerify false
-# Configure and restart RabbitMQ
+# Start and configure RabbitMQ
+service rabbitmq-server restart
+rabbitmqctl start_app
rabbitmqctl add_user yardstick yardstick
rabbitmqctl set_permissions yardstick ".*" ".*" ".*"
-rabbitmqctl reset
# install yardstick + dependencies
easy_install -U pip==9.0.1