diff --git a/.zuul.yaml b/.zuul.yaml
index 86f7c4ceac5..76254854ba5 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -17,7 +17,6 @@
         - openstack-tox-functional-py36:
             irrelevant-files: &functional-irrelevant-files
               - ^.*\.rst$
-              - ^api-ref/.*$
               - ^cinder/locale/.*$
               - ^cinder/tests/hacking/.*$
               - ^cinder/tests/unit.*$
@@ -31,7 +30,15 @@
         - openstack-tox-pylint:
             voting: false
             timeout: 5400
-            irrelevant-files: *functional-irrelevant-files
+            irrelevant-files:
+              - ^.*\.rst$
+              - ^api-ref/.*$
+              - ^cinder/locale/.*$
+              - ^cinder/tests/hacking/.*$
+              - ^cinder/tests/unit.*$
+              - ^contrib/block-box.*$
+              - ^doc/.*$
+              - ^releasenotes/.*$
         - cinder-plugin-ceph-tempest:
             irrelevant-files: &gate-irrelevant-files
               - ^(test-|)requirements.txt$
diff --git a/api-ref/source/v2/samples/encryption-type-create-request.json b/api-ref/source/v2/samples/encryption-type-create-request.json
index 6b9f97ec6b3..581a0282a21 100644
--- a/api-ref/source/v2/samples/encryption-type-create-request.json
+++ b/api-ref/source/v2/samples/encryption-type-create-request.json
@@ -1,6 +1,6 @@
 {
     "encryption":{
-        "key_size": 128,
+        "key_size": 256,
         "provider": "luks",
         "control_location":"front-end",
         "cipher": "aes-xts-plain64"
diff --git a/api-ref/source/v2/samples/encryption-type-create-response.json b/api-ref/source/v2/samples/encryption-type-create-response.json
index ad7f5c87cb5..de0964bff9f 100644
--- a/api-ref/source/v2/samples/encryption-type-create-response.json
+++ b/api-ref/source/v2/samples/encryption-type-create-response.json
@@ -3,7 +3,7 @@
         "volume_type_id": "2d29462d-76cb-417c-8a9f-fb23140f1577",
         "control_location": "front-end",
         "encryption_id": "81e069c6-7394-4856-8df7-3b237ca61f74",
-        "key_size": 128,
+        "key_size": 256,
         "provider": "luks",
         "cipher": "aes-xts-plain64"
     }
diff --git a/api-ref/source/v2/samples/encryption-type-show-response.json b/api-ref/source/v2/samples/encryption-type-show-response.json
index 9a168bf5fa6..3747f69db2a 100644
--- a/api-ref/source/v2/samples/encryption-type-show-response.json
+++ b/api-ref/source/v2/samples/encryption-type-show-response.json
@@ -5,7 +5,7 @@
     "created_at": "2016-12-28T02:32:25.000000",
     "updated_at": null,
     "encryption_id": "81e069c6-7394-4856-8df7-3b237ca61f74",
-    "key_size": 128,
+    "key_size": 256,
     "provider": "luks",
     "deleted_at": null,
     "cipher": "aes-xts-plain64"
diff --git a/api-ref/source/v3/samples/volume_type/encryption-type-show-response.json b/api-ref/source/v3/samples/volume_type/encryption-type-show-response.json
index 9a168bf5fa6..3747f69db2a 100644
--- a/api-ref/source/v3/samples/volume_type/encryption-type-show-response.json
+++ b/api-ref/source/v3/samples/volume_type/encryption-type-show-response.json
@@ -5,7 +5,7 @@
     "created_at": "2016-12-28T02:32:25.000000",
     "updated_at": null,
     "encryption_id": "81e069c6-7394-4856-8df7-3b237ca61f74",
-    "key_size": 128,
+    "key_size": 256,
     "provider": "luks",
     "deleted_at": null,
     "cipher": "aes-xts-plain64"
diff --git a/cinder/tests/functional/api_sample_tests/samples/volume_type/encryption-type-create-request.json.tpl b/cinder/tests/functional/api_sample_tests/samples/volume_type/encryption-type-create-request.json.tpl
index 6b9f97ec6b3..581a0282a21 100644
--- a/cinder/tests/functional/api_sample_tests/samples/volume_type/encryption-type-create-request.json.tpl
+++ b/cinder/tests/functional/api_sample_tests/samples/volume_type/encryption-type-create-request.json.tpl
@@ -1,6 +1,6 @@
 {
     "encryption":{
-        "key_size": 128,
+        "key_size": 256,
         "provider": "luks",
         "control_location":"front-end",
         "cipher": "aes-xts-plain64"
diff --git a/cinder/tests/functional/api_sample_tests/samples/volume_type/encryption-type-create-response.json.tpl b/cinder/tests/functional/api_sample_tests/samples/volume_type/encryption-type-create-response.json.tpl
index 1a8d9015bef..36f6dd1cccc 100644
--- a/cinder/tests/functional/api_sample_tests/samples/volume_type/encryption-type-create-response.json.tpl
+++ b/cinder/tests/functional/api_sample_tests/samples/volume_type/encryption-type-create-response.json.tpl
@@ -3,7 +3,7 @@
         "volume_type_id": "%(uuid)s",
         "control_location": "front-end",
         "encryption_id": "%(uuid)s",
-        "key_size": 128,
+        "key_size": 256,
         "provider": "luks",
         "cipher": "aes-xts-plain64"
     }
diff --git a/cinder/tests/functional/api_sample_tests/samples/volume_type/encryption-type-show-response.json.tpl b/cinder/tests/functional/api_sample_tests/samples/volume_type/encryption-type-show-response.json.tpl
index 2a602ec1bd1..fbc2fb3df79 100644
--- a/cinder/tests/functional/api_sample_tests/samples/volume_type/encryption-type-show-response.json.tpl
+++ b/cinder/tests/functional/api_sample_tests/samples/volume_type/encryption-type-show-response.json.tpl
@@ -5,7 +5,7 @@
     "created_at": "%(strtime)s",
     "updated_at": null,
     "encryption_id": "%(uuid)s",
-    "key_size": 128,
+    "key_size": 256,
     "provider": "luks",
     "deleted_at": null,
     "cipher": "aes-xts-plain64"