diff --git a/apps/ops/inventory.py b/apps/ops/inventory.py index 117d961a9..5b5e98551 100644 --- a/apps/ops/inventory.py +++ b/apps/ops/inventory.py @@ -50,7 +50,7 @@ class JMSInventory(BaseInventory): def convert_to_ansible(self, asset, run_as_admin=False): info = { 'id': asset.id, - 'hostname': asset.hostname, + 'hostname': asset.fullname, 'ip': asset.ip, 'port': asset.port, 'vars': dict(), diff --git a/apps/ops/views.py b/apps/ops/views.py index 380fdadf4..1bbfbfc23 100644 --- a/apps/ops/views.py +++ b/apps/ops/views.py @@ -6,7 +6,7 @@ from django.views.generic import ListView, DetailView, TemplateView from common.mixins import DatetimeSearchMixin from .models import Task, AdHoc, AdHocRunHistory, CeleryTask -from common.permissions import SuperUserRequiredMixin +from common.permissions import SuperUserRequiredMixin, AdminUserRequiredMixin class TaskListView(SuperUserRequiredMixin, DatetimeSearchMixin, ListView): @@ -121,6 +121,6 @@ class AdHocHistoryDetailView(SuperUserRequiredMixin, DetailView): return super().get_context_data(**kwargs) -class CeleryTaskLogView(SuperUserRequiredMixin, DetailView): +class CeleryTaskLogView(AdminUserRequiredMixin, DetailView): template_name = 'ops/celery_task_log.html' model = CeleryTask