diff --git a/awx/main/views.py b/awx/main/views.py index bc791976db..887d44318c 100644 --- a/awx/main/views.py +++ b/awx/main/views.py @@ -98,5 +98,6 @@ def handle_csp_violation(request): logger.error(json.loads(request.body)) return HttpResponse(content=None) + def handle_login_redirect(request): return HttpResponseRedirect("/#/login") diff --git a/awx/sso/pipeline.py b/awx/sso/pipeline.py index ed832e0c8e..212e3824ba 100644 --- a/awx/sso/pipeline.py +++ b/awx/sso/pipeline.py @@ -101,6 +101,7 @@ def _update_org_from_attr(user, related, attr, remove, remove_admins, remove_aud [o.auditor_role.members.remove(user) for o in Organization.objects.filter(Q(auditor_role__members=user) & ~Q(id__in=org_ids))] + def update_user_orgs(backend, details, user=None, *args, **kwargs): ''' Update organization memberships for the given user based on mapping rules diff --git a/installer/roles/kubernetes/handlers/main.yml b/installer/roles/kubernetes/handlers/main.yml index 35b5c55988..89b3fa701c 100644 --- a/installer/roles/kubernetes/handlers/main.yml +++ b/installer/roles/kubernetes/handlers/main.yml @@ -3,4 +3,3 @@ file: state: absent path: "{{ rmq_cert_tempdir.path }}" - diff --git a/installer/roles/kubernetes/tasks/ssl_cert_gen.yml b/installer/roles/kubernetes/tasks/ssl_cert_gen.yml index e2876b3421..c1b7199028 100644 --- a/installer/roles/kubernetes/tasks/ssl_cert_gen.yml +++ b/installer/roles/kubernetes/tasks/ssl_cert_gen.yml @@ -58,4 +58,3 @@ regexp: "server.crt|server.key" dest: "{{ rmq_cert_tempdir.path }}/server-combined.pem" mode: "0600" -