aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>2018-03-26 07:29:46 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-26 07:29:46 +0000
commit9f98dcb078f412157284399e210f26b0eec80ae7 (patch)
treed7275a862e6e2a5371527c1cb7aa55ee8a05cb6b
parentdc5d12165a19371da3d7682b80489c691364ef6f (diff)
parentb5436b214662c629c168c7af760f1f235b99669a (diff)
Merge "Install RabitMQ for RPC messaging between processes"
-rw-r--r--docker/Dockerfile3
-rw-r--r--docker/Dockerfile.aarch64.patch4
-rwxr-xr-xinstall.sh5
3 files changed, 9 insertions, 3 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 959315c6b..b97337e4d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -39,7 +39,8 @@ RUN ${YARDSTICK_REPO_DIR}/docker/supervisor.sh
RUN echo "daemon off;" >> /etc/nginx/nginx.conf
-EXPOSE 5000
+# nginx=5000, rabbitmq=5672
+EXPOSE 5000 5672
ADD http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img ${IMAGE_DIR}
ADD http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img ${IMAGE_DIR}
diff --git a/docker/Dockerfile.aarch64.patch b/docker/Dockerfile.aarch64.patch
index a2243293c..de272f5a8 100644
--- a/docker/Dockerfile.aarch64.patch
+++ b/docker/Dockerfile.aarch64.patch
@@ -42,8 +42,8 @@ index 2ee5b4c..23e5ea5 100644
RUN pip install appdirs==1.4.0 pyopenssl==17.5.0 python-openstackclient==3.11.0 python-heatclient==1.11.0
@@ -43,8 +44,8 @@ RUN echo "daemon off;" >> /etc/nginx/nginx.conf
-
- EXPOSE 5000
+# nginx=5000, rabbitmq=5672
+EXPOSE 5000 5672
-ADD http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img ${IMAGE_DIR}
-ADD http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img ${IMAGE_DIR}
diff --git a/install.sh b/install.sh
index 1dbf64ddf..6f4ab8c9d 100755
--- a/install.sh
+++ b/install.sh
@@ -85,6 +85,7 @@ apt-get update && apt-get install -y \
libxss-dev \
sudo \
iputils-ping
+ rabbitmq-server
if [[ "${DOCKER_ARCH}" != "aarch64" ]]; then
apt-get install -y libc6:arm64
@@ -94,6 +95,10 @@ apt-get -y autoremove && apt-get clean
git config --global http.sslVerify false
+# Configure and restart RabbitMQ
+rabbitmqctl add_user yardstick yardstick
+rabbitmqctl set_permissions yardstick ".*" ".*" ".*"
+rabbitmqctl reset
# install yardstick + dependencies
easy_install -U pip==9.0.1