From 04578222348432b64a9a0fe2e98ae1dabdfd164e Mon Sep 17 00:00:00 2001 From: Mohammed Zeeshan Ahmed Date: Fri, 2 Mar 2018 13:20:27 +0530 Subject: [PATCH] Adding filtering backends to API server. --- Dockerfile | 3 ++- Dockerfile.apiserver | 3 ++- container_pipeline/lib/default_settings.py | 1 + provisions/roles/django/tasks/main.yml | 7 +++++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a3640d70c..3930e3644 100755 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,8 @@ RUN yum install epel-release -y && \ yum remove epel-release -y && \ yum clean all -RUN pip install raven --upgrade && pip install django==1.11.2 psycopg2==2.7.3 djangorestframework drfdocs +RUN pip install raven --upgrade && pip install django==1.11.2 psycopg2==2.7.3 \ + djangorestframework drfdocs django-filter RUN mkdir -p /opt/cccp-service ADD node.kubeconfig ca.crt /opt/cccp-service/ diff --git a/Dockerfile.apiserver b/Dockerfile.apiserver index 6f7d42d2d..b9b989ba7 100644 --- a/Dockerfile.apiserver +++ b/Dockerfile.apiserver @@ -10,7 +10,8 @@ RUN yum install epel-release -y && \ yum remove epel-release -y && \ yum clean all -RUN pip install raven --upgrade && pip install django==1.11.2 psycopg2==2.7.3 djangorestframework drfdocs +RUN pip install raven --upgrade && pip install django==1.11.2 psycopg2==2.7.3 \ + djangorestframework drfdocs django-filter RUN mkdir -p /opt/cccp-service ADD node.kubeconfig ca.crt /opt/cccp-service/ diff --git a/container_pipeline/lib/default_settings.py b/container_pipeline/lib/default_settings.py index 0c1415dd5..5743c3bda 100644 --- a/container_pipeline/lib/default_settings.py +++ b/container_pipeline/lib/default_settings.py @@ -78,6 +78,7 @@ 'rest_framework.permissions.DjangoModelPermissionsOrAnonReadOnly' ], 'DEFAULT_PAGINATION_CLASS': 'container_pipeline.pagination.ModelAPIPagination', + 'DEFAULT_FILTER_BACKENDS': 'django_filters.rest_framework.DjangoFilterBackend', } LOGGING = dict( diff --git a/provisions/roles/django/tasks/main.yml b/provisions/roles/django/tasks/main.yml index a744cad52..5b193c789 100644 --- a/provisions/roles/django/tasks/main.yml +++ b/provisions/roles/django/tasks/main.yml @@ -37,6 +37,13 @@ - django - api +- name: Install Django REST Framework Filtering Backends + pip: name=django-filter + sudo: yes + tags: + - django + - api + - name: Install Docker yum: name=docker state=installed sudo: yes