diff options
| author |   Stepan Andrushko <stepanx.andrushko@intel.com> | 2019-02-19 19:14:55 +0200 |
|---|---|---|
| committer | Stepan Andrushko <stepanx.andrushko@intel.com> | 2019-02-20 15:16:21 +0200 |
| commit | 38c458e35a181e9cced957d733832c1e297e2e35 (patch) | |
| tree | 6b060c6ea4b7793f28e82135725ee7b3f572da77 /docker | |
| parent | 88c5dda9712afc71742b164905f21cfff45926fa (diff) | |
Yardstick container rabbitmq supervisor RUN state
Rabbitmq process exited supervisor and couldn't respawn it afterwards.
Updated the way rabbitmq service and node are spawned to have them
RUNNING after a service stop or node down.
JIRA: YARDSTICK-1600
Change-Id: Idd6812db7a1985e8c727efd7ea45572199c1a4a9
Signed-off-by: Stepan Andrushko <stepanx.andrushko@intel.com>
Diffstat (limited to 'docker')
| -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 |