diff --git a/rpc_deployment/inventory/group_vars/rsyslog.yml b/rpc_deployment/inventory/group_vars/rsyslog.yml
index e1d52065a5..4eda92992f 100644
--- a/rpc_deployment/inventory/group_vars/rsyslog.yml
+++ b/rpc_deployment/inventory/group_vars/rsyslog.yml
@@ -22,10 +22,3 @@ verbose: True
 
 container_lvm_fstype: ext4
 container_lvm_fssize: 5GB
-
-apt_container_repos:
-  - { repo: "ppa:adiscon/v8-stable", state: "present" }
-
-service_pip_dependencies:
-  - python-memcached
-  - pycrypto
diff --git a/rpc_deployment/playbooks/infrastructure/rsyslog-install.yml b/rpc_deployment/playbooks/infrastructure/rsyslog-install.yml
index 72e8e5f8ea..3c52295ea9 100644
--- a/rpc_deployment/playbooks/infrastructure/rsyslog-install.yml
+++ b/rpc_deployment/playbooks/infrastructure/rsyslog-install.yml
@@ -23,3 +23,4 @@
     - rsyslog
   vars_files:
     - vars/config_vars/container_config_rsyslog.yml
+    - vars/repo_packages/rsyslog.yml
diff --git a/rpc_deployment/roles/rsyslog/tasks/main.yml b/rpc_deployment/roles/rsyslog/tasks/main.yml
index 61cb89c164..548c749ada 100644
--- a/rpc_deployment/roles/rsyslog/tasks/main.yml
+++ b/rpc_deployment/roles/rsyslog/tasks/main.yml
@@ -14,11 +14,11 @@
 # limitations under the License.
 
 - name: Rsyslog Setup
-  template: >
-    src={{ item }}
-    dest=/etc/rsyslog.d/{{ item }}
-    owner=root
-    group=root
+  template:
+    src: "{{ item }}"
+    dest: "/etc/rsyslog.d/{{ item }}"
+    owner: "root"
+    group: "root"
   register: results
   with_items:
     - 50-default.conf
diff --git a/rpc_deployment/roles/rsyslog_config/tasks/main.yml b/rpc_deployment/roles/rsyslog_config/tasks/main.yml
index bdd169bf13..1127cee15e 100644
--- a/rpc_deployment/roles/rsyslog_config/tasks/main.yml
+++ b/rpc_deployment/roles/rsyslog_config/tasks/main.yml
@@ -14,12 +14,12 @@
 # limitations under the License.
 
 - name: Deploy rsyslog config generator
-  template: >
-    src={{ item }}
-    dest=/opt/{{ item }}
-    owner=root
-    group=root
-    mode=0755
+  template:
+    src: "{{ item }}"
+    dest: "/opt/{{ item }}"
+    owner: "root"
+    group: "root"
+    mode: "0755"
   with_items:
     - genlog.py
 
@@ -31,11 +31,11 @@
     /opt/genlog.py > /etc/rsyslog.d/51-openstack.conf
 
 - name: Ensure ownership on /var/spool/rsyslog
-  file: >
-    path=/var/spool/rsyslog
-    state=directory
-    owner=syslog
-    group=syslog
+  file:
+    path: "/var/spool/rsyslog"
+    state: "directory"
+    owner: "syslog"
+    group: "syslog"
 
 - name: Start rsyslog
   service: name=rsyslog state=restarted pattern=rsyslog
diff --git a/rpc_deployment/roles/rsyslog_stop/tasks/main.yml b/rpc_deployment/roles/rsyslog_stop/tasks/main.yml
index c8fdba7961..34c86158e3 100644
--- a/rpc_deployment/roles/rsyslog_stop/tasks/main.yml
+++ b/rpc_deployment/roles/rsyslog_stop/tasks/main.yml
@@ -14,4 +14,7 @@
 # limitations under the License.
 
 - name: stop rsyslog
-  service: name=rsyslog state=stopped pattern=rsyslog
+  service: 
+    name: "rsyslog"
+    state: "stopped"
+    pattern: "rsyslog"
diff --git a/rpc_deployment/vars/repo_packages/rsyslog.yml b/rpc_deployment/vars/repo_packages/rsyslog.yml
index 460f8b4483..d666e4cc0b 100644
--- a/rpc_deployment/vars/repo_packages/rsyslog.yml
+++ b/rpc_deployment/vars/repo_packages/rsyslog.yml
@@ -17,3 +17,7 @@ repo_package_name: rsyslog
 
 apt_container_repos:
   - { repo: "ppa:adiscon/v8-stable", state: "present" }
+
+service_pip_dependencies:
+  - python-memcached
+  - pycrypto