summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>2018-03-28 12:13:35 +0100
committerRodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>2018-03-28 11:24:30 +0000
commit18546b4f43b9c927c4c91529dd912c7368b941bf (patch)
treee5d594c6f5fac52be789f50ba3735a210b407880
parent929832345dab22c99b1fc331902be5509551576e (diff)
Fix RabbitMQ service installation and initialization
RabbitMQ service added in [1] is not correctly installed and initialized: - There is an error during the installation process ("\" character missing). - In the installation script, the service needs to be started first. - In the container installation, the service needs to be started via supervisor. [1]https://gerrit.opnfv.org/gerrit/#/c/53597/ JIRA: YARDSTICK-1103 Change-Id: Iade3d6ce4b522e6f576af71b7afe5559081f7929 Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
-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