diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile_ubuntu18 | 2 | ||||
| -rwxr-xr-x | docker/supervisor.sh | 12 |
2 files changed, 2 insertions, 12 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 bd17cfbc4..a4104c7fb 100755 --- a/docker/supervisor.sh +++ b/docker/supervisor.sh @@ -10,7 +10,6 @@ # 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 @@ -24,18 +23,9 @@ 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 = /bin/bash -c "service rabbitmq-server restart - rabbitmqctl start_app - rabbitmqctl add_user yardstick yardstick - rabbitmqctl set_permissions -p / yardstick '.*' '.*'" +command=/etc/yardstick/rabbitmq.sh EOF fi |