diff --git a/roles/rudder-node/handlers/main.yml b/roles/rudder-node/handlers/main.yml
new file mode 100644
index 0000000..dba70bd
--- /dev/null
+++ b/roles/rudder-node/handlers/main.yml
@@ -0,0 +1,10 @@
+---
+# handler du role rudder-node
+- name: rudder-start
+  service: name=rudder state=restarted
+
+- name: agent-inventory
+  command: rudder agent inventory
+
+- name: agent-run
+  command: rudder agent run
diff --git a/roles/rudder-node/tasks/main.yml b/roles/rudder-node/tasks/main.yml
new file mode 100644
index 0000000..cd0ca03
--- /dev/null
+++ b/roles/rudder-node/tasks/main.yml
@@ -0,0 +1,30 @@
+---
+## Install and configure rudder-agent on debian/ubuntu node
+- name: add rudder repo key
+  apt_key: url="https://www.rudder-project.org/apt-repos/rudder_apt_key.pub" state=present
+  when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
+
+- name: add rudder repo url
+  apt_repository:
+    repo: 'deb http://www.rudder-project.org/apt-4.1/ {{ansible_distribution_release}} main'
+    state: present
+    filename: 'rudder'
+    update_cache: yes
+  when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
+
+- name: install rudder agent
+  apt: pkg=rudder-agent state=present update_cache=yes
+  when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
+
+- name: configure rudder server
+  template:  src=policy_server.dat.tpl dest=/var/rudder/cfengine-community/policy_server.dat
+  when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
+  notify:
+      - rudder-start
+      - agent-inventory
+      - agent-run
+  when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
+
+- fail: msg="You can now connect to your rudder server and allow new nodes"
+  ignore_errors: yes
+  when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
diff --git a/roles/rudder-node/templates/policy_server.dat.tpl b/roles/rudder-node/templates/policy_server.dat.tpl
new file mode 100644
index 0000000..6116d75
--- /dev/null
+++ b/roles/rudder-node/templates/policy_server.dat.tpl
@@ -0,0 +1 @@
+{{rudder_server}}
diff --git a/rudder-node.yml b/rudder-node.yml
new file mode 100644
index 0000000..d5a35b4
--- /dev/null
+++ b/rudder-node.yml
@@ -0,0 +1,10 @@
+---
+# Playbook permettant d'installer une node rudder et configurer le retour vers le rudder server
+
+- name: Install rudder-node
+  hosts: all
+  user: root
+  gather_facts: yes
+
+  roles:
+    - rudder-node