diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile_ubuntu18 | 2 | ||||
| -rwxr-xr-x | docker/supervisor.sh | 14 |
2 files changed, 14 insertions, 2 deletions
diff --git a/docker/Dockerfile_ubuntu18 b/docker/Dockerfile_ubuntu18 index a9dfaeb6a..e9fe42ecb 100644 --- a/docker/Dockerfile_ubuntu18 +++ b/docker/Dockerfile_ubuntu18 @@ -9,7 +9,7 @@ FROM ubuntu:18.04 -LABEL image=opnfv/yardstick +LABEL image=opnfv/yardstick-ubuntu-18.04 ARG BRANCH=master diff --git a/docker/supervisor.sh b/docker/supervisor.sh index 44e34fb38..bd17cfbc4 100755 --- a/docker/supervisor.sh +++ b/docker/supervisor.sh @@ -10,8 +10,10 @@ # nginx service start when boot supervisor_config='/etc/supervisor/conf.d/yardstick.conf' +rabbitmq_config='/etc/supervisor/conf.d/rabbitmq.conf' if [[ ! -e "${supervisor_config}" ]]; then + cat << EOF > "${supervisor_config}" [supervisord] nodaemon = true @@ -22,8 +24,18 @@ command = service nginx restart [program:yardstick_uwsgi] directory = /etc/yardstick command = uwsgi -i yardstick.ini +EOF + +fi + +if [[ ! -e "${rabbitmq_config}" ]]; then + cat << EOF > "${rabbitmq_config}" [program:rabbitmq] -command = service rabbitmq-server restart +command = /bin/bash -c "service rabbitmq-server restart + rabbitmqctl start_app + rabbitmqctl add_user yardstick yardstick + rabbitmqctl set_permissions -p / yardstick '.*' '.*'" EOF + fi |