diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..2eec5d9
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=review.openstack.org
+port=29418
+project=openstack/ansible-role-atos-hsm.git
diff --git a/tasks/main.yaml b/tasks/main.yaml
index dda3c83..10a7239 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -1,20 +1,20 @@
 ---
 - name: Create working directory
   file:
-      path: "{{atos_client_working_dir}}"
+      path: "{{ atos_client_working_dir }}"
       state: directory
       mode: 0755
 
 - name: Download ATOS client ISO
   get_url:
-      url: "{{atos_client_iso_location}}"
-      dest: "{{atos_client_working_dir}}/{{atos_client_iso_name}}"
+      url: "{{ atos_client_iso_location }}"
+      dest: "{{ atos_client_working_dir }}/{{ atos_client_iso_name }}"
       force: no
 
 - name: Mount the iso for ATOS
   mount:
       path: /mnt/atos_iso
-      src: "{{atos_client_working_dir}}/{{atos_client_iso_name}}"
+      src: "{{ atos_client_working_dir }}/{{ atos_client_iso_name }}"
       fstype: iso9660
       state: mounted
 
@@ -37,7 +37,7 @@
       dest: /etc/proteccio/proteccio.rc
       content: |
           [PROTECCIO]
-          IPaddr={{atos_hsm_ip_address}}
+          IPaddr={{ atos_hsm_ip_address }}
           SSL=1
           SrvCert=server_cert.crt
 
@@ -50,21 +50,21 @@
 
 - name: Get the client cert
   get_url:
-      url: "{{atos_client_cert_location}}"
+      url: "{{ atos_client_cert_location }}"
       dest: /etc/proteccio/proteccio_client.crt
       force: no
 
 - name: Get the client key
   get_url:
-      url: "{{atos_client_key_location}}"
+      url: "{{ atos_client_key_location }}"
       dest: /etc/proteccio/proteccio_client.key
       force: no
 
 - name: Get the server cert
   get_url:
-      url: "{{atos_server_cert_location}}"
+      url: "{{ atos_server_cert_location }}"
       dest: /etc/proteccio/server_cert.crt
       force: no
 
-- name: run nethsmstatus to confirm connection
+- name: run nethsmstatus to confirm connection  # noqa 301
   command: nethsmstatus
diff --git a/test-requirements.txt b/test-requirements.txt
new file mode 100644
index 0000000..6dd128e
--- /dev/null
+++ b/test-requirements.txt
@@ -0,0 +1 @@
+ansible-lint
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..7b2f042
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,10 @@
+[tox]
+minversion = 2.0
+envlist = linters
+skipdist = true
+
+[testenv]
+deps = -r{toxinidir}/test-requirements.txt
+
+[testenv:linters]
+commands = ansible-lint {toxinidir}
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
new file mode 100644
index 0000000..2b85502
--- /dev/null
+++ b/zuul.d/layout.yaml
@@ -0,0 +1,11 @@
+---
+- project:
+    check:
+      jobs:
+        - openstack-tox-linters
+    gate:
+      jobs:
+        - openstack-tox-linters
+    post:
+      jobs:
+        - publish-openstack-python-branch-tarball