diff options
| author |   Volodymyr Mytnyk <volodymyrx.mytnyk@intel.com> | 2019-02-25 12:24:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-02-25 12:24:15 +0000 |
| commit | 4c995d8a3ad25afe2ad8d75d43c7519ce22797eb (patch) | |
| tree | abec90e5e0ad9b4f32983e4d594aaf87a7ce7e41 /docker/supervisor.sh | |
| parent | 7b394e216fb921958380510a4b5dcc914704f02e (diff) | |
| parent | 38c458e35a181e9cced957d733832c1e297e2e35 (diff) | |
Merge "Yardstick container rabbitmq supervisor RUN state"
Diffstat (limited to 'docker/supervisor.sh')
| -rwxr-xr-x | docker/supervisor.sh | 12 |
1 files changed, 1 insertions, 11 deletions
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 |