]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commit
dashboard: update layouts before the restart
authorDimitri Savineau <dsavinea@redhat.com>
Tue, 8 Oct 2019 13:54:06 +0000 (09:54 -0400)
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Wed, 9 Oct 2019 07:24:56 +0000 (07:24 +0000)
commiteb51cc1bb12b1059425c93e079d69c393df4be5c
tree5d5ec97fc657be2264c4e76179d6495ff2fe20d1
parent4e42d085f7147d38100b7535bc16667e747e9c52
dashboard: update layouts before the restart

If the mgr dashboard doesn't restart fast enough then the inject
dashboard task will fail with a HTTP error 400.

Error EINVAL: Traceback (most recent call last):
  File "/usr/share/ceph/mgr/mgr_module.py", line 914, in _handle_command
    return self.handle_command(inbuf, cmd)
  File "/usr/share/ceph/mgr/dashboard/module.py", line 450, in handle_command
    push_local_dashboards()
  File "/usr/share/ceph/mgr/dashboard/grafana.py", line 132, in push_local_dashboards
    retry()
  File "/usr/share/ceph/mgr/dashboard/grafana.py", line 89, in call
    result = self.func(*self.args, **self.kwargs)
  File "/usr/share/ceph/mgr/dashboard/grafana.py", line 127, in push
    grafana.push_dashboard(body)
  File "/usr/share/ceph/mgr/dashboard/grafana.py", line 54, in push_dashboard
    response.raise_for_status()
  File "/usr/lib/python2.7/site-packages/requests/models.py", line 834, in raise_for_status
    raise HTTPError(http_error_msg, response=self)
HTTPError: 400 Client Error: Bad Request

Instead we can trigger this task before the module restart.

Closes: #4565
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 3f6ff240b7d5a6863478cafc0aa78e2177a09ac3)
roles/ceph-dashboard/tasks/configure_dashboard.yml