diff --git a/rpc_deployment/roles/common/tasks/install_pip_deps.yml b/rpc_deployment/roles/common/tasks/install_pip_deps.yml
index b597f5ce12..33aa76e161 100644
--- a/rpc_deployment/roles/common/tasks/install_pip_deps.yml
+++ b/rpc_deployment/roles/common/tasks/install_pip_deps.yml
@@ -14,9 +14,9 @@
 # limitations under the License.
 
 - name: Install pip dependencies
-  pip: >
-    name={{ item }}
-    extra_args="--allow-all-external"
+  pip:
+    name: "{{ item }}"
+    extra_args: "--allow-all-external"
   with_items: service_pip_dependencies
   when: service_pip_dependencies is defined
   register: pip_install
diff --git a/rpc_deployment/roles/common/tasks/repos.yml b/rpc_deployment/roles/common/tasks/repos.yml
index 0a93ad6253..0f71302c48 100644
--- a/rpc_deployment/roles/common/tasks/repos.yml
+++ b/rpc_deployment/roles/common/tasks/repos.yml
@@ -14,17 +14,17 @@
 # limitations under the License.
 
 - name: add apt-keys
-  apt_key: >
-    id="{{ item.hash_id }}"
-    keyserver="{{ item.keyserver }}"
-    state=present
+  apt_key:
+    id: "{{ item.hash_id }}"
+    keyserver: "{{ item.keyserver }}"
+    state: "present"
   with_items: gpg_keys
   when: "ansible_distribution_version in ['12.04', '13.04', '13.10', '14.04']"
 
 - name: Add Common repos
-  apt_repository: >
-    repo="{{ item.repo }}"
-    state="{{ item.state }}"
+  apt_repository:
+    repo: "{{ item.repo }}"
+    state: "{{ item.state }}"
   with_items: apt_common_repos
   when: "ansible_distribution_version in ['12.04', '13.04', '13.10', '14.04']"
   register: add_repos
@@ -32,12 +32,12 @@
   retries: 3
 
 - name: Add mariadb priority file
-  template: >
-    src=mariadb-priority
-    dest=/etc/apt/preferences.d/mariadb.pref
-    owner=root
-    group=root
-    mode=0644
+  template:
+    src: "mariadb-priority"
+    dest: "/etc/apt/preferences.d/mariadb.pref"
+    owner: "root"
+    group: "root"
+    mode: "0644"
 
 - name: Ensure common Packages are Installed
   apt:
diff --git a/rpc_deployment/roles/common/tasks/rpc_release.yml b/rpc_deployment/roles/common/tasks/rpc_release.yml
index b5f8e2eebc..c5045bf6dc 100644
--- a/rpc_deployment/roles/common/tasks/rpc_release.yml
+++ b/rpc_deployment/roles/common/tasks/rpc_release.yml
@@ -14,8 +14,8 @@
 # limitations under the License.
 
 - name: Drop rpc version file
-  template: >
-    src=rpc-release
-    dest=/etc/rpc-release
-    owner="root"
-    group="root"
+  template:
+    src: "rpc-release"
+    dest: "/etc/rpc-release"
+    owner: "root"
+    group: "root"
diff --git a/rpc_deployment/roles/container_extra_setup/tasks/container_setup.yml b/rpc_deployment/roles/container_extra_setup/tasks/container_setup.yml
index 2dea846522..299e73ba32 100644
--- a/rpc_deployment/roles/container_extra_setup/tasks/container_setup.yml
+++ b/rpc_deployment/roles/container_extra_setup/tasks/container_setup.yml
@@ -14,37 +14,37 @@
 # limitations under the License.
 
 - name: Ensure extra inner directories
-  file: >
-    path={{ item }}
-    state=directory
+  file:
+    path: "{{ item }}"
+    state: "directory"
   with_items: required_inner_dirs
   when: required_inner_dirs is defined
   register: inner_extra_changed
 
 - name: Ensure extra local directories
-  file: >
-    path={{ item }}
-    state=directory
+  file:
+    path: "{{ item }}"
+    state: "directory"
   when: required_outer_dirs is defined
   with_items: required_outer_dirs
   register: local_extra_changed
   delegate_to: "{{ physical_host }}"
 
 - name: Ensure extra container config options
-  lxc: >
-    name={{ container_name }}
-    command=config
-    options="{{ container_config_options }}"
-    state=running
+  lxc:
+    name: "{{ container_name }}"
+    command: "config"
+    options: "{{ container_config_options }}"
+    state: "running"
   when: container_config_options is defined and is_metal != true
   register: config_extra_changed
   delegate_to: "{{ physical_host }}"
 
 - name: Wait for networking
-  wait_for: >
-    port=22
-    search_regex=OpenSSH
-    timeout=60
-    host={{ container_address }}
+  wait_for:
+    port: "22"
+    search_regex: "OpenSSH"
+    timeout: "60"
+    host: "{{ container_address }}"
   delegate_to: localhost
   when: inner_extra_changed|changed or local_extra_changed|changed or config_extra_changed|changed
diff --git a/rpc_deployment/roles/container_extra_setup/tasks/sysctl.yml b/rpc_deployment/roles/container_extra_setup/tasks/sysctl.yml
index ccb6da9f70..58babbd963 100644
--- a/rpc_deployment/roles/container_extra_setup/tasks/sysctl.yml
+++ b/rpc_deployment/roles/container_extra_setup/tasks/sysctl.yml
@@ -14,12 +14,12 @@
 # limitations under the License.
 
 - name: Adding new system tuning
-  sysctl: >
-    name="{{ item.key }}" 
-    value="{{ item.value }}"
-    sysctl_set="{{ item.set|default('yes') }}"
-    state="{{ item.state|default('present') }}"
-    reload="{{ item.reload|default('yes') }}"
+  sysctl:
+    name: "{{ item.key }}" 
+    value: "{{ item.value }}"
+    sysctl_set: "{{ item.set|default('yes') }}"
+    state: "{{ item.state|default('present') }}"
+    reload: "{{ item.reload|default('yes') }}"
   when: sysctl_options is defined
   with_items: sysctl_options
   delegate_to: "{{ physical_host }}"
diff --git a/rpc_deployment/roles/elasticsearch/tasks/main.yml b/rpc_deployment/roles/elasticsearch/tasks/main.yml
index 8b5a67711d..4a25c9c845 100644
--- a/rpc_deployment/roles/elasticsearch/tasks/main.yml
+++ b/rpc_deployment/roles/elasticsearch/tasks/main.yml
@@ -14,22 +14,22 @@
 # limitations under the License.
 
 - name: ElasticSearch Setup
-  template: >
-    src={{ item }}
-    dest=/etc/elasticsearch/{{ item }}
-    owner=root
-    group=root
+  template:
+    src: "{{ item }}"
+    dest: "/etc/elasticsearch/{{ item }}"
+    owner: "root"
+    group: "root"
   register: results
   with_items:
     - elasticsearch.yml
     - logging.yml
 
 - name: ElasticSearch Tuning
-  template: >
-    src={{ item }}
-    dest=/etc/default/{{ item }}
-    owner=root
-    group=root
+  template:
+    src: "{{ item }}"
+    dest: "/etc/default/{{ item }}"
+    owner: "root"
+    group: "root"
   register: results
   with_items:
     - elasticsearch
@@ -71,22 +71,19 @@
   when: results|changed
 
 - name: Wait for elasticsearch port
-  wait_for: >
-    host={{ ansible_ssh_host }}
-    port=9200
+  wait_for:
+    host: "{{ ansible_ssh_host }}"
+    port: "9200"
 
 - name: Deploy mapping script
-  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:
     - mapping.sh
 
 - name: Add logging template
-  shell: >
-    ./mapping.sh
-    chdir=/opt
-
+  shell: /opt/mapping.sh
diff --git a/rpc_deployment/roles/horizon_apache/tasks/main.yml b/rpc_deployment/roles/horizon_apache/tasks/main.yml
index e882c3d03a..b3b9e681da 100644
--- a/rpc_deployment/roles/horizon_apache/tasks/main.yml
+++ b/rpc_deployment/roles/horizon_apache/tasks/main.yml
@@ -14,32 +14,32 @@
 # limitations under the License.
 
 - name: Drop apache2 ports file
-  template: >
-    src=horizon-ports.conf
-    dest=/etc/apache2/ports.conf
-    owner="root"
-    group="root"
+  template:
+    src: "horizon-ports.conf"
+    dest: "/etc/apache2/ports.conf"
+    owner: "root"
+    group: "root"
 
 - name: Drop Horizon config
-  template: >
-    src=openstack-dashboard.conf
-    dest=/etc/apache2/sites-available
-    owner={{ system_user }}
-    group={{ system_group }}
+  template:
+    src: "openstack-dashboard.conf"
+    dest: "/etc/apache2/sites-available"
+    owner: "{{ system_user }}"
+    group: "{{ system_group }}"
 
 - name: Enable Horizon Site
-  file: >
-    src=/etc/apache2/sites-available/{{ item.name }}
-    dest=/etc/apache2/sites-enabled/{{ item.name }}
-    state={{ item.state }}
+  file:
+    src: "/etc/apache2/sites-available/{{ item.name }}"
+    dest: "/etc/apache2/sites-enabled/{{ item.name }}"
+    state: "{{ item.state }}"
   with_items:
     - { state: link, name: openstack-dashboard.conf }
     - { state: absent, name: 000-default.conf }
 
 - name: Enable apache2 modules
-  apache2_module: >
-    state={{ item.state }}
-    name={{ item.name }}
+  apache2_module:
+    state: "{{ item.state }}"
+    name: "{{ item.name }}"
   with_items:
     - { state: present, name: wsgi }
     - { state: present, name: ssl }
@@ -48,9 +48,11 @@
     - { state: present, name: rewrite }
 
 - name: Ensure Apache ServerName
-  lineinfile: >
-    dest=/etc/apache2/apache2.conf
-    line="ServerName {{ container_name }}"
+  lineinfile:
+    dest: "/etc/apache2/apache2.conf"
+    line: "ServerName {{ container_name }}"
 
 - name: Ensure Apache is running
-  service: name=apache2 state=restarted
+  service: 
+    name: "apache2"
+    state: "restarted"
diff --git a/rpc_deployment/roles/host_common/templates/ircbalance b/rpc_deployment/roles/host_common/templates/irqbalance
similarity index 100%
rename from rpc_deployment/roles/host_common/templates/ircbalance
rename to rpc_deployment/roles/host_common/templates/irqbalance
diff --git a/rpc_deployment/roles/keystone_apache/tasks/main.yml b/rpc_deployment/roles/keystone_apache/tasks/main.yml
index 8ff1935ade..7ee12395dc 100644
--- a/rpc_deployment/roles/keystone_apache/tasks/main.yml
+++ b/rpc_deployment/roles/keystone_apache/tasks/main.yml
@@ -14,50 +14,50 @@
 # limitations under the License.
 
 - name: Drop apache2 ports file
-  template: >
-    src=keystone-ports.conf
-    dest=/etc/apache2/ports.conf
-    owner="root"
-    group="root"
+  template:
+    src: "keystone-ports.conf"
+    dest: "/etc/apache2/ports.conf"
+    owner: "root"
+    group: "root"
   notify: Restart Apache
 
 - name: Drop keystone vhost file
-  template: >
-    src=keystone-httpd.conf
-    dest=/etc/apache2/sites-available/keystone-httpd.conf
-    owner="root"
-    group="root"
+  template:
+    src: "keystone-httpd.conf"
+    dest: "/etc/apache2/sites-available/keystone-httpd.conf"
+    owner: "root"
+    group: "root"
   notify: Restart Apache
 
 - name: Disable default apache site
-  file: >
-    path=/etc/apache2/sites-enabled/000-default.conf
-    state="absent"
+  file:
+    path: "/etc/apache2/sites-enabled/000-default.conf"
+    state: "absent"
   notify: Restart Apache
 
 - name: Enabled keystone vhost
-  file: >
-    src=/etc/apache2/sites-available/keystone-httpd.conf
-    dest=/etc/apache2/sites-enabled/keystone-httpd.conf
-    state=link
+  file:
+    src: "/etc/apache2/sites-available/keystone-httpd.conf"
+    dest: "/etc/apache2/sites-enabled/keystone-httpd.conf"
+    state: "link"
   notify: Restart Apache
 
 - name: Link keystone wsgi admin file
-  file: >
-    src="/opt/{{ service_name }}_{{ git_install_branch | replace('/', '_') }}/httpd/keystone.py"
-    dest=/var/www/cgi-bin/keystone/admin
-    state=link
+  file:
+    src: "/opt/{{ service_name }}_{{ git_install_branch | replace('/', '_') }}/httpd/keystone.py"
+    dest: "/var/www/cgi-bin/keystone/admin"
+    state: "link"
   notify: Restart Apache
 
 - name: Link keystone wsgi main file
-  file: >
-    src="/opt/{{ service_name }}_{{ git_install_branch | replace('/', '_') }}/httpd/keystone.py"
-    dest=/var/www/cgi-bin/keystone/main
-    state=link
+  file:
+    src: "/opt/{{ service_name }}_{{ git_install_branch | replace('/', '_') }}/httpd/keystone.py"
+    dest: "/var/www/cgi-bin/keystone/main"
+    state: "link"
   notify: Restart Apache
 
 - name: Ensure Apache ServerName
-  lineinfile: >
-    dest=/etc/apache2/apache2.conf
-    line="ServerName {{ container_name }}"
+  lineinfile:
+    dest: "/etc/apache2/apache2.conf"
+    line: "ServerName {{ container_name }}"
   notify: Restart Apache
diff --git a/rpc_deployment/roles/keystone_common/tasks/keystone_config.yml b/rpc_deployment/roles/keystone_common/tasks/keystone_config.yml
index fe2a43c4db..ce807e2b3c 100644
--- a/rpc_deployment/roles/keystone_common/tasks/keystone_config.yml
+++ b/rpc_deployment/roles/keystone_common/tasks/keystone_config.yml
@@ -14,21 +14,21 @@
 # limitations under the License.
 
 - name: Setup Keystone Config
-  template: >
-    src={{ item }}
-    dest=/etc/keystone/{{ item }}
-    owner={{ system_user }}
-    group={{ system_group }}
+  template:
+    src: "{{ item }}"
+    dest: "/etc/keystone/{{ item }}"
+    owner: "{{ system_user }}"
+    group: "{{ system_group }}"
   with_items:
     - default_catalog.templates
     - policy.json
 
 - name: Generate Keystone Config
-  template: >
-    src=template_gen
-    dest=/etc/keystone/{{ item.file }}
-    owner={{ system_user }}
-    group={{ system_group }}
+  template:
+    src: "template_gen"
+    dest: "/etc/keystone/{{ item.file }}"
+    owner: "{{ system_user }}"
+    group: "{{ system_group }}"
   with_items:
       - { file: keystone.conf, var: "{{ keystone_conf }}" }
       - { file: keystone-paste.ini, var: "{{ keystone_paste_ini }}" }
diff --git a/rpc_deployment/roles/kibana/tasks/main.yml b/rpc_deployment/roles/kibana/tasks/main.yml
index 0371bdec83..63f08de8d8 100644
--- a/rpc_deployment/roles/kibana/tasks/main.yml
+++ b/rpc_deployment/roles/kibana/tasks/main.yml
@@ -14,24 +14,24 @@
 # limitations under the License.
 
 - name: Download Kibana
-  get_url: >
-    url={{ kibana_url }}
-    dest=/tmp/kibana.tar.gz
-    mode=0644
+  get_url:
+    url: "{{ kibana_url }}"
+    dest: "/tmp/kibana.tar.gz"
+    mode: "0644"
 
 - name: Extract Kibana
-  unarchive: >
-    copy=no
-    src=/tmp/kibana.tar.gz
-    dest=/opt
+  unarchive:
+    copy: "no"
+    src: "/tmp/kibana.tar.gz"
+    dest: "/opt"
 
 - name: Link Kibana Directory
-  file: >
-    state=link
-    src=/opt/kibana-3.1.0
-    dest={{ kibana_root }}
-    owner={{ system_user }}
-    group={{ system_group }}
+  file:
+    state: "link"
+    src: "/opt/kibana-3.1.0"
+    dest: "{{ kibana_root }}"
+    owner: "{{ system_user }}"
+    group: "{{ system_group }}"
 
 - name: create self-signed SSL cert
   command: >
@@ -57,65 +57,73 @@
   command: a2enmod proxy_http
 
 - name: Kibana Setup
-  template: >
-    src={{ item }}
-    dest="/etc/apache2/sites-available/{{ item }}"
-    owner={{ system_user }}
-    group={{ system_group }}
+  template:
+    src: "{{ item }}"
+    dest: "/etc/apache2/sites-available/{{ item }}"
+    owner: "{{ system_user }}"
+    group: "{{ system_group }}"
   register: results
   with_items:
     - 000-kibana.conf
 
 - name: Fix Apache2 Paths
-  template: >
-    src={{ item }}
-    dest="/etc/apache2/{{ item }}"
-    owner=root
-    group=root
+  template:
+    src: "{{ item }}"
+    dest: "/etc/apache2/{{ item }}"
+    owner: "root"
+    group: "root"
   with_items:
     - apache2.conf
 
 - name: Drop Apache2 Ports File
-  template: >
-    src={{ item }}
-    dest="/etc/apache2/{{ item }}"
-    owner=root
-    group=root
+  template:
+    src: "{{ item }}"
+    dest: "/etc/apache2/{{ item }}"
+    owner: "root"
+    group: "root"
   with_items:
     - ports.conf
 
 - name: Kibana Config
-  template: >
-    src={{ item }}
-    dest="{{ kibana_root }}/{{ item }}"
-    owner={{ system_user }}
-    group={{ system_group }}
+  template:
+    src: "{{ item }}"
+    dest: "{{ kibana_root }}/{{ item }}"
+    owner: "{{ system_user }}"
+    group: "{{ system_group }}"
   register: results
   with_items:
     - config.js
 
 - name: Link Kibana Site
-  file: >
-    state=link
-    src=/etc/apache2/sites-available/000-kibana.conf
-    dest=/etc/apache2/sites-enabled/000-kibana.conf
-    owner={{ system_user }}
-    group={{ system_group }}
+  file:
+    state: "link"
+    src: "/etc/apache2/sites-available/000-kibana.conf"
+    dest: "/etc/apache2/sites-enabled/000-kibana.conf"
+    owner: "{{ system_user }}"
+    group: "{{ system_group }}"
 
 - name: Remove Apache Default Site
-  file: >
-    state=absent
-    path=/etc/apache2/sites-enabled/000-default.conf
+  file:
+    state: "absent"
+    path: "/etc/apache2/sites-enabled/000-default.conf"
 
 - name: Create kibana http_auth user
-  htpasswd: path=/etc/apache2/users name=kibana password={{ kibana_password }} owner=root group=www-data mode=0640 create=yes state=present
+  htpasswd: 
+    path: "/etc/apache2/users"
+    name: "kibana"
+    password: "{{ kibana_password }}"
+    owner: "root"
+    group: "www-data"
+    mode: "0640"
+    create: "yes"
+    state: "present"
 
 - name: Install Next Gen RPC Dashboard
-  template: >
-    src={{ item }}
-    dest="/opt/kibana/app/dashboards/{{ item }}"
-    owner=root
-    group=root
+  template:
+    src: "{{ item }}"
+    dest: "/opt/kibana/app/dashboards/{{ item }}"
+    owner: "root"
+    group: "root"
   with_items:
     - Next-Gen-RPC.json
 
diff --git a/rpc_deployment/roles/lxc_common/tasks/lxc_container_cache.yml b/rpc_deployment/roles/lxc_common/tasks/lxc_container_cache.yml
index 105167b9be..0763dd98e2 100644
--- a/rpc_deployment/roles/lxc_common/tasks/lxc_container_cache.yml
+++ b/rpc_deployment/roles/lxc_common/tasks/lxc_container_cache.yml
@@ -14,10 +14,10 @@
 # limitations under the License.
 
 - name: Download lxc cache
-  get_url: >
-    url="{{ rpc_repo_url }}/rpc-trusty-container.tgz"
-    dest=/var/cache/lxc/rpc-trusty-container.tgz
-    mode=0440
+  get_url:
+    url: "{{ rpc_repo_url }}/rpc-trusty-container.tgz"
+    dest: "/var/cache/lxc/rpc-trusty-container.tgz"
+    mode: "0440"
   register: cache_download
   async: 600
   poll: 15
@@ -25,8 +25,8 @@
   until: cache_download|success
 
 - name: Move lxc cached image into place
-  unarchive: >
-    src=/var/cache/lxc/rpc-trusty-container.tgz
-    dest=/var/cache/lxc/
-    copy=no
+  unarchive:
+    src: "/var/cache/lxc/rpc-trusty-container.tgz"
+    dest: "/var/cache/lxc/"
+    copy: "no"
   when: cache_download|changed
diff --git a/rpc_deployment/roles/lxc_common/tasks/lxc_host_setup.yml b/rpc_deployment/roles/lxc_common/tasks/lxc_host_setup.yml
index 6d3d964a1e..04cab63e09 100644
--- a/rpc_deployment/roles/lxc_common/tasks/lxc_host_setup.yml
+++ b/rpc_deployment/roles/lxc_common/tasks/lxc_host_setup.yml
@@ -14,22 +14,22 @@
 # limitations under the License.
 
 - name: set base lxc template
-  template: >
-    src={{ item.src }}
-    dest={{ item.dest }}
-    owner=root
-    group=root 
-    mode={{ item.mode }}
+  template:
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+    owner: "root"
+    group: "root"
+    mode: "{{ item.mode }}"
   with_items:
     - { src: lxc-rpc.conf, dest: "/etc/lxc/lxc-rpc.conf", mode: "0644" }
     - { src: lxc-rpc, dest: "/usr/share/lxc/templates/lxc-rpc", mode: "0755" }
 
 - name: Set apparmor profile for nova-compute
-  copy: >
-    src=lxc-openstack
-    dest=/etc/apparmor.d/lxc/lxc-openstack
-    owner="root"
-    group="root"
+  copy:
+    src: "lxc-openstack"
+    dest: "/etc/apparmor.d/lxc/lxc-openstack"
+    owner: "root"
+    group: "root"
   register: apparmor_update
   notify: Reindex apparmor profiles for lxc
 
diff --git a/rpc_deployment/roles/lxc_common/tasks/lxc_install.yml b/rpc_deployment/roles/lxc_common/tasks/lxc_install.yml
index 30e2f02a79..e8de19aedc 100644
--- a/rpc_deployment/roles/lxc_common/tasks/lxc_install.yml
+++ b/rpc_deployment/roles/lxc_common/tasks/lxc_install.yml
@@ -14,9 +14,9 @@
 # limitations under the License.
 
 - name: Add LXC repos
-  apt_repository: >
-    repo="{{ item.repo }}"
-    state="{{ item.state }}"
+  apt_repository:
+    repo: "{{ item.repo }}"
+    state: "{{ item.state }}"
   with_items: apt_lxc_common_repos
   when: "ansible_distribution_version in ['12.04', '13.04', '13.10']"