From 266fd61ad727e55cd68fed118daf34cf24ac0383 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Mon, 2 Mar 2020 10:01:17 +0100
Subject: [PATCH] Use "name:" instead of "role:" for *_role modules

Both include_role and import_role expect role's name to be given
via "name" param instead of "role".
This worked but caused errors with ansible-lint.
See: https://review.opendev.org/694779

Change-Id: I388d4ae27111e430d38df1abcb6c6127d90a06e0
---
 ansible/nova.yml                              |  6 +-
 ansible/roles/aodh/tasks/loadbalancer.yml     |  2 +-
 ansible/roles/barbican/tasks/loadbalancer.yml |  2 +-
 ansible/roles/barbican/tasks/stop.yml         |  2 +-
 ansible/roles/blazar/tasks/loadbalancer.yml   |  2 +-
 ansible/roles/blazar/tasks/stop.yml           |  2 +-
 ansible/roles/ceilometer/tasks/stop.yml       |  2 +-
 ansible/roles/chrony/tasks/stop.yml           |  2 +-
 ansible/roles/cinder/tasks/loadbalancer.yml   |  2 +-
 ansible/roles/cinder/tasks/stop.yml           |  2 +-
 .../roles/cloudkitty/tasks/loadbalancer.yml   |  2 +-
 ansible/roles/cloudkitty/tasks/stop.yml       |  2 +-
 ansible/roles/collectd/tasks/stop.yml         |  2 +-
 ansible/roles/common/tasks/stop.yml           |  2 +-
 ansible/roles/congress/tasks/loadbalancer.yml |  2 +-
 ansible/roles/congress/tasks/stop.yml         |  2 +-
 ansible/roles/cyborg/tasks/loadbalancer.yml   |  2 +-
 ansible/roles/cyborg/tasks/stop.yml           |  2 +-
 .../roles/designate/tasks/loadbalancer.yml    |  2 +-
 ansible/roles/designate/tasks/stop.yml        |  2 +-
 .../elasticsearch/tasks/loadbalancer.yml      |  2 +-
 ansible/roles/elasticsearch/tasks/stop.yml    |  2 +-
 ansible/roles/etcd/tasks/stop.yml             |  2 +-
 ansible/roles/freezer/tasks/loadbalancer.yml  |  2 +-
 ansible/roles/freezer/tasks/stop.yml          |  2 +-
 ansible/roles/glance/tasks/loadbalancer.yml   |  2 +-
 ansible/roles/glance/tasks/stop.yml           |  2 +-
 ansible/roles/gnocchi/tasks/loadbalancer.yml  |  2 +-
 ansible/roles/gnocchi/tasks/stop.yml          |  2 +-
 ansible/roles/grafana/tasks/loadbalancer.yml  |  2 +-
 ansible/roles/grafana/tasks/stop.yml          |  2 +-
 ansible/roles/haproxy/tasks/config.yml        |  2 +-
 ansible/roles/haproxy/tasks/stop.yml          |  2 +-
 ansible/roles/heat/tasks/loadbalancer.yml     |  2 +-
 ansible/roles/heat/tasks/stop.yml             |  2 +-
 ansible/roles/horizon/tasks/loadbalancer.yml  |  2 +-
 ansible/roles/horizon/tasks/stop.yml          |  2 +-
 ansible/roles/influxdb/tasks/loadbalancer.yml |  2 +-
 ansible/roles/influxdb/tasks/stop.yml         |  2 +-
 ansible/roles/ironic/tasks/config.yml         |  2 +-
 ansible/roles/ironic/tasks/loadbalancer.yml   |  2 +-
 ansible/roles/ironic/tasks/stop.yml           |  2 +-
 ansible/roles/iscsi/tasks/config.yml          |  2 +-
 ansible/roles/iscsi/tasks/stop.yml            |  2 +-
 ansible/roles/kafka/tasks/stop.yml            |  2 +-
 ansible/roles/karbor/tasks/loadbalancer.yml   |  2 +-
 ansible/roles/karbor/tasks/stop.yml           |  2 +-
 ansible/roles/keystone/tasks/loadbalancer.yml |  2 +-
 ansible/roles/keystone/tasks/stop.yml         |  2 +-
 ansible/roles/kibana/tasks/loadbalancer.yml   |  2 +-
 ansible/roles/kibana/tasks/stop.yml           |  2 +-
 ansible/roles/kuryr/tasks/stop.yml            |  2 +-
 ansible/roles/magnum/tasks/loadbalancer.yml   |  2 +-
 ansible/roles/magnum/tasks/stop.yml           |  2 +-
 ansible/roles/manila/tasks/loadbalancer.yml   |  2 +-
 ansible/roles/manila/tasks/stop.yml           |  2 +-
 ansible/roles/mariadb/tasks/loadbalancer.yml  |  2 +-
 ansible/roles/mariadb/tasks/stop.yml          |  2 +-
 ansible/roles/masakari/tasks/loadbalancer.yml |  2 +-
 ansible/roles/masakari/tasks/stop.yml         |  2 +-
 .../roles/memcached/tasks/loadbalancer.yml    |  2 +-
 ansible/roles/memcached/tasks/stop.yml        |  2 +-
 ansible/roles/mistral/tasks/loadbalancer.yml  |  2 +-
 ansible/roles/mistral/tasks/stop.yml          |  2 +-
 ansible/roles/monasca/tasks/loadbalancer.yml  |  2 +-
 ansible/roles/monasca/tasks/stop.yml          |  2 +-
 ansible/roles/mongodb/tasks/loadbalancer.yml  |  2 +-
 ansible/roles/mongodb/tasks/stop.yml          |  2 +-
 ansible/roles/multipathd/tasks/config.yml     |  2 +-
 ansible/roles/multipathd/tasks/stop.yml       |  2 +-
 ansible/roles/murano/tasks/loadbalancer.yml   |  2 +-
 ansible/roles/murano/tasks/stop.yml           |  2 +-
 ansible/roles/neutron/tasks/config.yml        |  2 +-
 ansible/roles/neutron/tasks/loadbalancer.yml  |  2 +-
 ansible/roles/neutron/tasks/stop.yml          |  2 +-
 .../tasks/cell_proxy_loadbalancer.yml         |  2 +-
 ansible/roles/nova-cell/tasks/stop.yml        |  2 +-
 ansible/roles/nova/tasks/loadbalancer.yml     |  2 +-
 ansible/roles/nova/tasks/stop.yml             |  2 +-
 ansible/roles/octavia/tasks/loadbalancer.yml  |  2 +-
 ansible/roles/octavia/tasks/stop.yml          |  2 +-
 ansible/roles/openvswitch/tasks/config.yml    |  2 +-
 ansible/roles/openvswitch/tasks/stop.yml      |  2 +-
 ansible/roles/ovs-dpdk/tasks/stop.yml         |  2 +-
 ansible/roles/panko/tasks/loadbalancer.yml    |  2 +-
 ansible/roles/panko/tasks/stop.yml            |  2 +-
 .../roles/placement/tasks/loadbalancer.yml    |  2 +-
 ansible/roles/placement/tasks/stop.yml        |  2 +-
 .../roles/prometheus/tasks/loadbalancer.yml   |  2 +-
 ansible/roles/prometheus/tasks/stop.yml       |  2 +-
 ansible/roles/qdrouterd/tasks/stop.yml        |  2 +-
 ansible/roles/qinling/tasks/loadbalancer.yml  |  2 +-
 ansible/roles/qinling/tasks/stop.yml          |  2 +-
 ansible/roles/rabbitmq/tasks/loadbalancer.yml |  2 +-
 ansible/roles/rabbitmq/tasks/stop.yml         |  2 +-
 ansible/roles/rally/tasks/stop.yml            |  2 +-
 ansible/roles/redis/tasks/stop.yml            |  2 +-
 ansible/roles/sahara/tasks/loadbalancer.yml   |  2 +-
 ansible/roles/sahara/tasks/stop.yml           |  2 +-
 .../roles/searchlight/tasks/loadbalancer.yml  |  2 +-
 ansible/roles/searchlight/tasks/stop.yml      |  2 +-
 ansible/roles/senlin/tasks/loadbalancer.yml   |  2 +-
 ansible/roles/senlin/tasks/stop.yml           |  2 +-
 ansible/roles/skydive/tasks/loadbalancer.yml  |  2 +-
 ansible/roles/skydive/tasks/stop.yml          |  2 +-
 ansible/roles/solum/tasks/loadbalancer.yml    |  2 +-
 ansible/roles/solum/tasks/stop.yml            |  2 +-
 ansible/roles/storm/tasks/stop.yml            |  2 +-
 ansible/roles/swift/tasks/loadbalancer.yml    |  2 +-
 ansible/roles/tacker/tasks/loadbalancer.yml   |  2 +-
 ansible/roles/tacker/tasks/stop.yml           |  2 +-
 ansible/roles/telegraf/tasks/stop.yml         |  2 +-
 ansible/roles/tempest/tasks/stop.yml          |  2 +-
 ansible/roles/trove/tasks/loadbalancer.yml    |  2 +-
 ansible/roles/trove/tasks/stop.yml            |  2 +-
 ansible/roles/vitrage/tasks/loadbalancer.yml  |  2 +-
 ansible/roles/vitrage/tasks/stop.yml          |  2 +-
 ansible/roles/vmtp/tasks/stop.yml             |  2 +-
 ansible/roles/watcher/tasks/loadbalancer.yml  |  2 +-
 ansible/roles/watcher/tasks/stop.yml          |  2 +-
 ansible/roles/zookeeper/tasks/stop.yml        |  2 +-
 ansible/roles/zun/tasks/loadbalancer.yml      |  2 +-
 ansible/roles/zun/tasks/stop.yml              |  2 +-
 ansible/site.yml                              | 98 +++++++++----------
 124 files changed, 174 insertions(+), 174 deletions(-)

diff --git a/ansible/nova.yml b/ansible/nova.yml
index 311a0bb696..bab6983997 100644
--- a/ansible/nova.yml
+++ b/ansible/nova.yml
@@ -194,7 +194,7 @@
   serial: '{{ kolla_serial|default("0") }}'
   tasks:
     - import_role:
-        role: nova-cell
+        name: nova-cell
         tasks_from: reload
       when:
         - enable_nova | bool
@@ -236,7 +236,7 @@
   serial: '{{ kolla_serial|default("0") }}'
   tasks:
     - import_role:
-        role: nova
+        name: nova
         tasks_from: online_data_migrations
       when:
         - enable_nova | bool
@@ -259,7 +259,7 @@
   serial: '{{ kolla_serial|default("0") }}'
   tasks:
     - import_role:
-        role: nova-cell
+        name: nova-cell
         tasks_from: online_data_migrations
       when:
         - enable_nova | bool
diff --git a/ansible/roles/aodh/tasks/loadbalancer.yml b/ansible/roles/aodh/tasks/loadbalancer.yml
index 2e4ead6dd3..b66ad26c9f 100644
--- a/ansible/roles/aodh/tasks/loadbalancer.yml
+++ b/ansible/roles/aodh/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ aodh_services }}"
   tags: always
diff --git a/ansible/roles/barbican/tasks/loadbalancer.yml b/ansible/roles/barbican/tasks/loadbalancer.yml
index 6a30bf0636..122b6beeea 100644
--- a/ansible/roles/barbican/tasks/loadbalancer.yml
+++ b/ansible/roles/barbican/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ barbican_services }}"
   tags: always
diff --git a/ansible/roles/barbican/tasks/stop.yml b/ansible/roles/barbican/tasks/stop.yml
index f7a415e26a..2565578cb2 100644
--- a/ansible/roles/barbican/tasks/stop.yml
+++ b/ansible/roles/barbican/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ barbican_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/blazar/tasks/loadbalancer.yml b/ansible/roles/blazar/tasks/loadbalancer.yml
index 928bfba7ae..a6560189c9 100644
--- a/ansible/roles/blazar/tasks/loadbalancer.yml
+++ b/ansible/roles/blazar/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ blazar_services }}"
   tags: always
diff --git a/ansible/roles/blazar/tasks/stop.yml b/ansible/roles/blazar/tasks/stop.yml
index bd95ef5162..79dd48743e 100644
--- a/ansible/roles/blazar/tasks/stop.yml
+++ b/ansible/roles/blazar/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ blazar_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/ceilometer/tasks/stop.yml b/ansible/roles/ceilometer/tasks/stop.yml
index fe151a027d..62431fde12 100644
--- a/ansible/roles/ceilometer/tasks/stop.yml
+++ b/ansible/roles/ceilometer/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ ceilometer_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/chrony/tasks/stop.yml b/ansible/roles/chrony/tasks/stop.yml
index 03883ff363..db8c758016 100644
--- a/ansible/roles/chrony/tasks/stop.yml
+++ b/ansible/roles/chrony/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ chrony_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/cinder/tasks/loadbalancer.yml b/ansible/roles/cinder/tasks/loadbalancer.yml
index 16dd82c0e6..e8070be96d 100644
--- a/ansible/roles/cinder/tasks/loadbalancer.yml
+++ b/ansible/roles/cinder/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ cinder_services }}"
   tags: always
diff --git a/ansible/roles/cinder/tasks/stop.yml b/ansible/roles/cinder/tasks/stop.yml
index 7de1a95d76..6424c5a2fb 100644
--- a/ansible/roles/cinder/tasks/stop.yml
+++ b/ansible/roles/cinder/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ cinder_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/cloudkitty/tasks/loadbalancer.yml b/ansible/roles/cloudkitty/tasks/loadbalancer.yml
index 4119b9fd03..5f3b9fc8b3 100644
--- a/ansible/roles/cloudkitty/tasks/loadbalancer.yml
+++ b/ansible/roles/cloudkitty/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ cloudkitty_services }}"
   tags: always
diff --git a/ansible/roles/cloudkitty/tasks/stop.yml b/ansible/roles/cloudkitty/tasks/stop.yml
index 22c0f26568..def3d155ab 100644
--- a/ansible/roles/cloudkitty/tasks/stop.yml
+++ b/ansible/roles/cloudkitty/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ cloudkitty_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/collectd/tasks/stop.yml b/ansible/roles/collectd/tasks/stop.yml
index 01794e8685..93bdf8952c 100644
--- a/ansible/roles/collectd/tasks/stop.yml
+++ b/ansible/roles/collectd/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ collectd_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/common/tasks/stop.yml b/ansible/roles/common/tasks/stop.yml
index 3b2aaf7e48..141f3b3f20 100644
--- a/ansible/roles/common/tasks/stop.yml
+++ b/ansible/roles/common/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ common_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/congress/tasks/loadbalancer.yml b/ansible/roles/congress/tasks/loadbalancer.yml
index 5c985b80d4..4e271bfd3e 100644
--- a/ansible/roles/congress/tasks/loadbalancer.yml
+++ b/ansible/roles/congress/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ congress_services }}"
   tags: always
diff --git a/ansible/roles/congress/tasks/stop.yml b/ansible/roles/congress/tasks/stop.yml
index 8c2f0dbda0..89d66300a3 100644
--- a/ansible/roles/congress/tasks/stop.yml
+++ b/ansible/roles/congress/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ congress_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/cyborg/tasks/loadbalancer.yml b/ansible/roles/cyborg/tasks/loadbalancer.yml
index 971b7583ab..1d7b477870 100644
--- a/ansible/roles/cyborg/tasks/loadbalancer.yml
+++ b/ansible/roles/cyborg/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ cyborg_services }}"
   tags: always
diff --git a/ansible/roles/cyborg/tasks/stop.yml b/ansible/roles/cyborg/tasks/stop.yml
index 87085221f7..2a5eb47972 100644
--- a/ansible/roles/cyborg/tasks/stop.yml
+++ b/ansible/roles/cyborg/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ cyborg_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/designate/tasks/loadbalancer.yml b/ansible/roles/designate/tasks/loadbalancer.yml
index b8e2a76b89..6ddefc01ad 100644
--- a/ansible/roles/designate/tasks/loadbalancer.yml
+++ b/ansible/roles/designate/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ designate_services }}"
   tags: always
diff --git a/ansible/roles/designate/tasks/stop.yml b/ansible/roles/designate/tasks/stop.yml
index 166323f5a8..a7b44c9c34 100644
--- a/ansible/roles/designate/tasks/stop.yml
+++ b/ansible/roles/designate/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ designate_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/elasticsearch/tasks/loadbalancer.yml b/ansible/roles/elasticsearch/tasks/loadbalancer.yml
index bdf431f56a..02eab8afa0 100644
--- a/ansible/roles/elasticsearch/tasks/loadbalancer.yml
+++ b/ansible/roles/elasticsearch/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ elasticsearch_services }}"
   tags: always
diff --git a/ansible/roles/elasticsearch/tasks/stop.yml b/ansible/roles/elasticsearch/tasks/stop.yml
index bbf5ce56b3..fee24e492a 100644
--- a/ansible/roles/elasticsearch/tasks/stop.yml
+++ b/ansible/roles/elasticsearch/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ elasticsearch_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/etcd/tasks/stop.yml b/ansible/roles/etcd/tasks/stop.yml
index b68d9184d4..45cf86b47f 100644
--- a/ansible/roles/etcd/tasks/stop.yml
+++ b/ansible/roles/etcd/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ etcd_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/freezer/tasks/loadbalancer.yml b/ansible/roles/freezer/tasks/loadbalancer.yml
index 7e95c94d68..dbe0cdb9bc 100644
--- a/ansible/roles/freezer/tasks/loadbalancer.yml
+++ b/ansible/roles/freezer/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ freezer_services }}"
   tags: always
diff --git a/ansible/roles/freezer/tasks/stop.yml b/ansible/roles/freezer/tasks/stop.yml
index cd9f745de0..cb39b3d793 100644
--- a/ansible/roles/freezer/tasks/stop.yml
+++ b/ansible/roles/freezer/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ freezer_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/glance/tasks/loadbalancer.yml b/ansible/roles/glance/tasks/loadbalancer.yml
index 96ece25ef0..36efea057c 100644
--- a/ansible/roles/glance/tasks/loadbalancer.yml
+++ b/ansible/roles/glance/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ glance_services }}"
   tags: always
diff --git a/ansible/roles/glance/tasks/stop.yml b/ansible/roles/glance/tasks/stop.yml
index 8f0ce1a7d8..ed8f3197f3 100644
--- a/ansible/roles/glance/tasks/stop.yml
+++ b/ansible/roles/glance/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ glance_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/gnocchi/tasks/loadbalancer.yml b/ansible/roles/gnocchi/tasks/loadbalancer.yml
index 2535c4dd74..b77c440a4d 100644
--- a/ansible/roles/gnocchi/tasks/loadbalancer.yml
+++ b/ansible/roles/gnocchi/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ gnocchi_services }}"
   tags: always
diff --git a/ansible/roles/gnocchi/tasks/stop.yml b/ansible/roles/gnocchi/tasks/stop.yml
index 5bff185939..1469409b36 100644
--- a/ansible/roles/gnocchi/tasks/stop.yml
+++ b/ansible/roles/gnocchi/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ gnocchi_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/grafana/tasks/loadbalancer.yml b/ansible/roles/grafana/tasks/loadbalancer.yml
index 74c484277d..0f61db2044 100644
--- a/ansible/roles/grafana/tasks/loadbalancer.yml
+++ b/ansible/roles/grafana/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ grafana_services }}"
   tags: always
diff --git a/ansible/roles/grafana/tasks/stop.yml b/ansible/roles/grafana/tasks/stop.yml
index 4a7696c084..82ba9c8e5e 100644
--- a/ansible/roles/grafana/tasks/stop.yml
+++ b/ansible/roles/grafana/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ grafana_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/haproxy/tasks/config.yml b/ansible/roles/haproxy/tasks/config.yml
index 53b0f1e516..fd215a32d0 100644
--- a/ansible/roles/haproxy/tasks/config.yml
+++ b/ansible/roles/haproxy/tasks/config.yml
@@ -85,7 +85,7 @@
 
 - name: Load and persist keepalived module
   import_role:
-    role: module-load
+    name: module-load
   vars:
     modules:
       - {'name': ip_vs }
diff --git a/ansible/roles/haproxy/tasks/stop.yml b/ansible/roles/haproxy/tasks/stop.yml
index aa5d0f6419..cb70188ba5 100644
--- a/ansible/roles/haproxy/tasks/stop.yml
+++ b/ansible/roles/haproxy/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ haproxy_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/heat/tasks/loadbalancer.yml b/ansible/roles/heat/tasks/loadbalancer.yml
index ddce7154e4..020b523add 100644
--- a/ansible/roles/heat/tasks/loadbalancer.yml
+++ b/ansible/roles/heat/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ heat_services }}"
   tags: always
diff --git a/ansible/roles/heat/tasks/stop.yml b/ansible/roles/heat/tasks/stop.yml
index 5211a14f63..99584bf2dd 100644
--- a/ansible/roles/heat/tasks/stop.yml
+++ b/ansible/roles/heat/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ heat_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/horizon/tasks/loadbalancer.yml b/ansible/roles/horizon/tasks/loadbalancer.yml
index 4a16fc14c1..da37990bdc 100644
--- a/ansible/roles/horizon/tasks/loadbalancer.yml
+++ b/ansible/roles/horizon/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ horizon_services }}"
   tags: always
diff --git a/ansible/roles/horizon/tasks/stop.yml b/ansible/roles/horizon/tasks/stop.yml
index 4a8e5781af..ed10425a2d 100644
--- a/ansible/roles/horizon/tasks/stop.yml
+++ b/ansible/roles/horizon/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ horizon_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/influxdb/tasks/loadbalancer.yml b/ansible/roles/influxdb/tasks/loadbalancer.yml
index 37a0ac7771..f4fd8cca3e 100644
--- a/ansible/roles/influxdb/tasks/loadbalancer.yml
+++ b/ansible/roles/influxdb/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ influxdb_services }}"
   tags: always
diff --git a/ansible/roles/influxdb/tasks/stop.yml b/ansible/roles/influxdb/tasks/stop.yml
index 29d340ee92..5c0194eb48 100644
--- a/ansible/roles/influxdb/tasks/stop.yml
+++ b/ansible/roles/influxdb/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ influxdb_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/ironic/tasks/config.yml b/ansible/roles/ironic/tasks/config.yml
index c337f924ca..af4e492edd 100644
--- a/ansible/roles/ironic/tasks/config.yml
+++ b/ansible/roles/ironic/tasks/config.yml
@@ -1,7 +1,7 @@
 ---
 - name: Load and persist iscsi_tcp module
   import_role:
-    role: module-load
+    name: module-load
   vars:
     modules:
       - {'name': iscsi_tcp}
diff --git a/ansible/roles/ironic/tasks/loadbalancer.yml b/ansible/roles/ironic/tasks/loadbalancer.yml
index 5dc896f19f..b3a7155d12 100644
--- a/ansible/roles/ironic/tasks/loadbalancer.yml
+++ b/ansible/roles/ironic/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ ironic_services }}"
   tags: always
diff --git a/ansible/roles/ironic/tasks/stop.yml b/ansible/roles/ironic/tasks/stop.yml
index aef5c515e1..a8db783707 100644
--- a/ansible/roles/ironic/tasks/stop.yml
+++ b/ansible/roles/ironic/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ ironic_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/iscsi/tasks/config.yml b/ansible/roles/iscsi/tasks/config.yml
index 85fb1e65a1..6bda5f7012 100644
--- a/ansible/roles/iscsi/tasks/config.yml
+++ b/ansible/roles/iscsi/tasks/config.yml
@@ -1,7 +1,7 @@
 ---
 - name: Load and persist configfs module
   import_role:
-    role: module-load
+    name: module-load
   vars:
     modules:
       - name: configfs
diff --git a/ansible/roles/iscsi/tasks/stop.yml b/ansible/roles/iscsi/tasks/stop.yml
index 13fc08797a..e828958c61 100644
--- a/ansible/roles/iscsi/tasks/stop.yml
+++ b/ansible/roles/iscsi/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ iscsi_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/kafka/tasks/stop.yml b/ansible/roles/kafka/tasks/stop.yml
index f52b76f385..2ede1b9cb2 100644
--- a/ansible/roles/kafka/tasks/stop.yml
+++ b/ansible/roles/kafka/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ kafka_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/karbor/tasks/loadbalancer.yml b/ansible/roles/karbor/tasks/loadbalancer.yml
index 4ddb12f67d..17f71e00cd 100644
--- a/ansible/roles/karbor/tasks/loadbalancer.yml
+++ b/ansible/roles/karbor/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ karbor_services }}"
   tags: always
diff --git a/ansible/roles/karbor/tasks/stop.yml b/ansible/roles/karbor/tasks/stop.yml
index 54775a0581..0db3f1ec1c 100644
--- a/ansible/roles/karbor/tasks/stop.yml
+++ b/ansible/roles/karbor/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ karbor_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/keystone/tasks/loadbalancer.yml b/ansible/roles/keystone/tasks/loadbalancer.yml
index 8983ab529a..954388aa90 100644
--- a/ansible/roles/keystone/tasks/loadbalancer.yml
+++ b/ansible/roles/keystone/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ keystone_services }}"
   tags: always
diff --git a/ansible/roles/keystone/tasks/stop.yml b/ansible/roles/keystone/tasks/stop.yml
index 4463110652..fd6ed4cf39 100644
--- a/ansible/roles/keystone/tasks/stop.yml
+++ b/ansible/roles/keystone/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ keystone_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/kibana/tasks/loadbalancer.yml b/ansible/roles/kibana/tasks/loadbalancer.yml
index e3b452aefc..9112f4f743 100644
--- a/ansible/roles/kibana/tasks/loadbalancer.yml
+++ b/ansible/roles/kibana/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ kibana_services }}"
   tags: always
diff --git a/ansible/roles/kibana/tasks/stop.yml b/ansible/roles/kibana/tasks/stop.yml
index 5c5034a464..878fb7e678 100644
--- a/ansible/roles/kibana/tasks/stop.yml
+++ b/ansible/roles/kibana/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ kibana_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/kuryr/tasks/stop.yml b/ansible/roles/kuryr/tasks/stop.yml
index 674769b357..bc445e3bfa 100644
--- a/ansible/roles/kuryr/tasks/stop.yml
+++ b/ansible/roles/kuryr/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ kuryr_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/magnum/tasks/loadbalancer.yml b/ansible/roles/magnum/tasks/loadbalancer.yml
index 0356c77cd0..9de5560e44 100644
--- a/ansible/roles/magnum/tasks/loadbalancer.yml
+++ b/ansible/roles/magnum/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ magnum_services }}"
   tags: always
diff --git a/ansible/roles/magnum/tasks/stop.yml b/ansible/roles/magnum/tasks/stop.yml
index 0e6c3504dc..93d8874c2f 100644
--- a/ansible/roles/magnum/tasks/stop.yml
+++ b/ansible/roles/magnum/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ magnum_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/manila/tasks/loadbalancer.yml b/ansible/roles/manila/tasks/loadbalancer.yml
index 9204d82f77..91f201a186 100644
--- a/ansible/roles/manila/tasks/loadbalancer.yml
+++ b/ansible/roles/manila/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ manila_services }}"
   tags: always
diff --git a/ansible/roles/manila/tasks/stop.yml b/ansible/roles/manila/tasks/stop.yml
index a65735642c..07f2d2368a 100644
--- a/ansible/roles/manila/tasks/stop.yml
+++ b/ansible/roles/manila/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ manila_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/mariadb/tasks/loadbalancer.yml b/ansible/roles/mariadb/tasks/loadbalancer.yml
index c72b8f0b79..5f461beae6 100644
--- a/ansible/roles/mariadb/tasks/loadbalancer.yml
+++ b/ansible/roles/mariadb/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ mariadb_services }}"
   tags: always
diff --git a/ansible/roles/mariadb/tasks/stop.yml b/ansible/roles/mariadb/tasks/stop.yml
index d60e30573f..f70237bd6c 100644
--- a/ansible/roles/mariadb/tasks/stop.yml
+++ b/ansible/roles/mariadb/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ mariadb_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/masakari/tasks/loadbalancer.yml b/ansible/roles/masakari/tasks/loadbalancer.yml
index 7154eca6a1..0eed33fd06 100644
--- a/ansible/roles/masakari/tasks/loadbalancer.yml
+++ b/ansible/roles/masakari/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ masakari_services }}"
   tags: always
diff --git a/ansible/roles/masakari/tasks/stop.yml b/ansible/roles/masakari/tasks/stop.yml
index 9aca7ac741..2b07065815 100644
--- a/ansible/roles/masakari/tasks/stop.yml
+++ b/ansible/roles/masakari/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ masakari_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/memcached/tasks/loadbalancer.yml b/ansible/roles/memcached/tasks/loadbalancer.yml
index b21c7632a8..4ddf84710e 100644
--- a/ansible/roles/memcached/tasks/loadbalancer.yml
+++ b/ansible/roles/memcached/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ memcached_services }}"
   tags: always
diff --git a/ansible/roles/memcached/tasks/stop.yml b/ansible/roles/memcached/tasks/stop.yml
index 2ca860f3ce..2535818ab7 100644
--- a/ansible/roles/memcached/tasks/stop.yml
+++ b/ansible/roles/memcached/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ memcached_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/mistral/tasks/loadbalancer.yml b/ansible/roles/mistral/tasks/loadbalancer.yml
index 2dd1f3ccd1..7a1c327cb3 100644
--- a/ansible/roles/mistral/tasks/loadbalancer.yml
+++ b/ansible/roles/mistral/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ mistral_services }}"
   tags: always
diff --git a/ansible/roles/mistral/tasks/stop.yml b/ansible/roles/mistral/tasks/stop.yml
index e5feb22229..3f85f2e00a 100644
--- a/ansible/roles/mistral/tasks/stop.yml
+++ b/ansible/roles/mistral/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ mistral_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/monasca/tasks/loadbalancer.yml b/ansible/roles/monasca/tasks/loadbalancer.yml
index 2aa16b070c..1c8cd4b097 100644
--- a/ansible/roles/monasca/tasks/loadbalancer.yml
+++ b/ansible/roles/monasca/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ monasca_services }}"
   tags: always
diff --git a/ansible/roles/monasca/tasks/stop.yml b/ansible/roles/monasca/tasks/stop.yml
index d387236b95..362d507665 100644
--- a/ansible/roles/monasca/tasks/stop.yml
+++ b/ansible/roles/monasca/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ monasca_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/mongodb/tasks/loadbalancer.yml b/ansible/roles/mongodb/tasks/loadbalancer.yml
index 070834d4e7..6b04bf10d6 100644
--- a/ansible/roles/mongodb/tasks/loadbalancer.yml
+++ b/ansible/roles/mongodb/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ mongodb_services }}"
   tags: always
diff --git a/ansible/roles/mongodb/tasks/stop.yml b/ansible/roles/mongodb/tasks/stop.yml
index 47d98263f3..b1085e166e 100644
--- a/ansible/roles/mongodb/tasks/stop.yml
+++ b/ansible/roles/mongodb/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ mongodb_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/multipathd/tasks/config.yml b/ansible/roles/multipathd/tasks/config.yml
index 4a3da5c3e8..b11ea424e3 100644
--- a/ansible/roles/multipathd/tasks/config.yml
+++ b/ansible/roles/multipathd/tasks/config.yml
@@ -1,7 +1,7 @@
 ---
 - name: Load and persist dm-multipath module
   import_role:
-    role: module-load
+    name: module-load
   vars:
     modules:
       - {'name': dm-multipath}
diff --git a/ansible/roles/multipathd/tasks/stop.yml b/ansible/roles/multipathd/tasks/stop.yml
index 383564e8f1..66a7d46e1a 100644
--- a/ansible/roles/multipathd/tasks/stop.yml
+++ b/ansible/roles/multipathd/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ multipathd_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/murano/tasks/loadbalancer.yml b/ansible/roles/murano/tasks/loadbalancer.yml
index 7fa492b737..8619ed9717 100644
--- a/ansible/roles/murano/tasks/loadbalancer.yml
+++ b/ansible/roles/murano/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ murano_services }}"
   tags: always
diff --git a/ansible/roles/murano/tasks/stop.yml b/ansible/roles/murano/tasks/stop.yml
index e395fe4c0c..8e110ef997 100644
--- a/ansible/roles/murano/tasks/stop.yml
+++ b/ansible/roles/murano/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ murano_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml
index c28ef33a7f..8cd917a6ea 100644
--- a/ansible/roles/neutron/tasks/config.yml
+++ b/ansible/roles/neutron/tasks/config.yml
@@ -1,7 +1,7 @@
 ---
 - name: Load and persist ip6_tables module
   include_role:
-    role: module-load
+    name: module-load
   vars:
     modules:
       - {'name': ip6_tables}
diff --git a/ansible/roles/neutron/tasks/loadbalancer.yml b/ansible/roles/neutron/tasks/loadbalancer.yml
index aaa85b1e62..4ad32c259f 100644
--- a/ansible/roles/neutron/tasks/loadbalancer.yml
+++ b/ansible/roles/neutron/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ neutron_services }}"
   tags: always
diff --git a/ansible/roles/neutron/tasks/stop.yml b/ansible/roles/neutron/tasks/stop.yml
index 8c030e9e87..6e3ad940be 100644
--- a/ansible/roles/neutron/tasks/stop.yml
+++ b/ansible/roles/neutron/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ neutron_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/nova-cell/tasks/cell_proxy_loadbalancer.yml b/ansible/roles/nova-cell/tasks/cell_proxy_loadbalancer.yml
index 1be4866bc6..80c8f7cd0d 100644
--- a/ansible/roles/nova-cell/tasks/cell_proxy_loadbalancer.yml
+++ b/ansible/roles/nova-cell/tasks/cell_proxy_loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 # Configure HAProxy for one cell for a particular console proxy type.
 - import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ cell_proxy_project_services | namespace_haproxy_for_cell(cell_name) }}"
     # Default is necessary because this play may not be targetting the hosts in
diff --git a/ansible/roles/nova-cell/tasks/stop.yml b/ansible/roles/nova-cell/tasks/stop.yml
index 49d6ee927f..34c08e055c 100644
--- a/ansible/roles/nova-cell/tasks/stop.yml
+++ b/ansible/roles/nova-cell/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ nova_cell_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/nova/tasks/loadbalancer.yml b/ansible/roles/nova/tasks/loadbalancer.yml
index 32b58e292c..21851745ae 100644
--- a/ansible/roles/nova/tasks/loadbalancer.yml
+++ b/ansible/roles/nova/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ nova_services }}"
   tags: always
diff --git a/ansible/roles/nova/tasks/stop.yml b/ansible/roles/nova/tasks/stop.yml
index b3cad51983..3cee9118ee 100644
--- a/ansible/roles/nova/tasks/stop.yml
+++ b/ansible/roles/nova/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ nova_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/octavia/tasks/loadbalancer.yml b/ansible/roles/octavia/tasks/loadbalancer.yml
index 543f284cb7..57eba01ccc 100644
--- a/ansible/roles/octavia/tasks/loadbalancer.yml
+++ b/ansible/roles/octavia/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ octavia_services }}"
   tags: always
diff --git a/ansible/roles/octavia/tasks/stop.yml b/ansible/roles/octavia/tasks/stop.yml
index f6a48244ed..1e4aefe241 100644
--- a/ansible/roles/octavia/tasks/stop.yml
+++ b/ansible/roles/octavia/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ octavia_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/openvswitch/tasks/config.yml b/ansible/roles/openvswitch/tasks/config.yml
index 4b5294bc45..3069071d1b 100644
--- a/ansible/roles/openvswitch/tasks/config.yml
+++ b/ansible/roles/openvswitch/tasks/config.yml
@@ -1,7 +1,7 @@
 ---
 - name: Load and persist openvswitch module
   import_role:
-    role: module-load
+    name: module-load
   vars:
     modules:
       - {'name': openvswitch}
diff --git a/ansible/roles/openvswitch/tasks/stop.yml b/ansible/roles/openvswitch/tasks/stop.yml
index c6c8ca2822..b0ecb2facb 100644
--- a/ansible/roles/openvswitch/tasks/stop.yml
+++ b/ansible/roles/openvswitch/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ openvswitch_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/ovs-dpdk/tasks/stop.yml b/ansible/roles/ovs-dpdk/tasks/stop.yml
index a5a8a02e56..71fda73ac9 100644
--- a/ansible/roles/ovs-dpdk/tasks/stop.yml
+++ b/ansible/roles/ovs-dpdk/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ ovsdpdk_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/panko/tasks/loadbalancer.yml b/ansible/roles/panko/tasks/loadbalancer.yml
index 53016b9ded..1b4f518158 100644
--- a/ansible/roles/panko/tasks/loadbalancer.yml
+++ b/ansible/roles/panko/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ panko_services }}"
   tags: always
diff --git a/ansible/roles/panko/tasks/stop.yml b/ansible/roles/panko/tasks/stop.yml
index 3d4fec5c39..5875cb4fc0 100644
--- a/ansible/roles/panko/tasks/stop.yml
+++ b/ansible/roles/panko/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ panko_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/placement/tasks/loadbalancer.yml b/ansible/roles/placement/tasks/loadbalancer.yml
index 9b6b8970a5..41c052cb16 100644
--- a/ansible/roles/placement/tasks/loadbalancer.yml
+++ b/ansible/roles/placement/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ placement_services }}"
   tags: always
diff --git a/ansible/roles/placement/tasks/stop.yml b/ansible/roles/placement/tasks/stop.yml
index eb98f416f9..03da58a450 100644
--- a/ansible/roles/placement/tasks/stop.yml
+++ b/ansible/roles/placement/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ placement_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/prometheus/tasks/loadbalancer.yml b/ansible/roles/prometheus/tasks/loadbalancer.yml
index 8f0161af67..794798f147 100644
--- a/ansible/roles/prometheus/tasks/loadbalancer.yml
+++ b/ansible/roles/prometheus/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ prometheus_services }}"
   tags: always
diff --git a/ansible/roles/prometheus/tasks/stop.yml b/ansible/roles/prometheus/tasks/stop.yml
index cda4198a6c..18d4f9bc58 100644
--- a/ansible/roles/prometheus/tasks/stop.yml
+++ b/ansible/roles/prometheus/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ prometheus_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/qdrouterd/tasks/stop.yml b/ansible/roles/qdrouterd/tasks/stop.yml
index a466a87ff7..06338ec17e 100644
--- a/ansible/roles/qdrouterd/tasks/stop.yml
+++ b/ansible/roles/qdrouterd/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ qdrouterd_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/qinling/tasks/loadbalancer.yml b/ansible/roles/qinling/tasks/loadbalancer.yml
index 4b0b6ccbf9..5d33b5d658 100644
--- a/ansible/roles/qinling/tasks/loadbalancer.yml
+++ b/ansible/roles/qinling/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ qinling_services }}"
   tags: always
diff --git a/ansible/roles/qinling/tasks/stop.yml b/ansible/roles/qinling/tasks/stop.yml
index c3a4142ace..2402dfe382 100644
--- a/ansible/roles/qinling/tasks/stop.yml
+++ b/ansible/roles/qinling/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ qinling_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/rabbitmq/tasks/loadbalancer.yml b/ansible/roles/rabbitmq/tasks/loadbalancer.yml
index 918c7796e0..5841602634 100644
--- a/ansible/roles/rabbitmq/tasks/loadbalancer.yml
+++ b/ansible/roles/rabbitmq/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ rabbitmq_services }}"
   tags: always
diff --git a/ansible/roles/rabbitmq/tasks/stop.yml b/ansible/roles/rabbitmq/tasks/stop.yml
index f13c35e515..1b6e3517b9 100644
--- a/ansible/roles/rabbitmq/tasks/stop.yml
+++ b/ansible/roles/rabbitmq/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ rabbitmq_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/rally/tasks/stop.yml b/ansible/roles/rally/tasks/stop.yml
index 792d4ccfe7..ca8ea8080b 100644
--- a/ansible/roles/rally/tasks/stop.yml
+++ b/ansible/roles/rally/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ rally_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/redis/tasks/stop.yml b/ansible/roles/redis/tasks/stop.yml
index d4566d02e8..452b62ffbe 100644
--- a/ansible/roles/redis/tasks/stop.yml
+++ b/ansible/roles/redis/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ redis_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/sahara/tasks/loadbalancer.yml b/ansible/roles/sahara/tasks/loadbalancer.yml
index b8c3edb547..235c7b1df7 100644
--- a/ansible/roles/sahara/tasks/loadbalancer.yml
+++ b/ansible/roles/sahara/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ sahara_services }}"
   tags: always
diff --git a/ansible/roles/sahara/tasks/stop.yml b/ansible/roles/sahara/tasks/stop.yml
index 02c3e6a905..28c1c535b1 100644
--- a/ansible/roles/sahara/tasks/stop.yml
+++ b/ansible/roles/sahara/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ sahara_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/searchlight/tasks/loadbalancer.yml b/ansible/roles/searchlight/tasks/loadbalancer.yml
index b911642e51..5f38f2a068 100644
--- a/ansible/roles/searchlight/tasks/loadbalancer.yml
+++ b/ansible/roles/searchlight/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ searchlight_services }}"
   tags: always
diff --git a/ansible/roles/searchlight/tasks/stop.yml b/ansible/roles/searchlight/tasks/stop.yml
index d6f795395c..7ad29acfd8 100644
--- a/ansible/roles/searchlight/tasks/stop.yml
+++ b/ansible/roles/searchlight/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ searchlight_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/senlin/tasks/loadbalancer.yml b/ansible/roles/senlin/tasks/loadbalancer.yml
index 47b2c0d140..7fed6aa11e 100644
--- a/ansible/roles/senlin/tasks/loadbalancer.yml
+++ b/ansible/roles/senlin/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ senlin_services }}"
   tags: always
diff --git a/ansible/roles/senlin/tasks/stop.yml b/ansible/roles/senlin/tasks/stop.yml
index 336538ad24..93b8215b61 100644
--- a/ansible/roles/senlin/tasks/stop.yml
+++ b/ansible/roles/senlin/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ senlin_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/skydive/tasks/loadbalancer.yml b/ansible/roles/skydive/tasks/loadbalancer.yml
index 74078cd396..a75d3ee3e4 100644
--- a/ansible/roles/skydive/tasks/loadbalancer.yml
+++ b/ansible/roles/skydive/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ skydive_services }}"
   tags: always
diff --git a/ansible/roles/skydive/tasks/stop.yml b/ansible/roles/skydive/tasks/stop.yml
index a6e363029c..93397a2de5 100644
--- a/ansible/roles/skydive/tasks/stop.yml
+++ b/ansible/roles/skydive/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ skydive_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/solum/tasks/loadbalancer.yml b/ansible/roles/solum/tasks/loadbalancer.yml
index f6d8ed8612..12c0538559 100644
--- a/ansible/roles/solum/tasks/loadbalancer.yml
+++ b/ansible/roles/solum/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ solum_services }}"
   tags: always
diff --git a/ansible/roles/solum/tasks/stop.yml b/ansible/roles/solum/tasks/stop.yml
index 2667cb9227..5018e56e6c 100644
--- a/ansible/roles/solum/tasks/stop.yml
+++ b/ansible/roles/solum/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ solum_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/storm/tasks/stop.yml b/ansible/roles/storm/tasks/stop.yml
index 2bc5681d68..eba1e5b2aa 100644
--- a/ansible/roles/storm/tasks/stop.yml
+++ b/ansible/roles/storm/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ storm_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/swift/tasks/loadbalancer.yml b/ansible/roles/swift/tasks/loadbalancer.yml
index 7393ec9323..f5e6b15f87 100644
--- a/ansible/roles/swift/tasks/loadbalancer.yml
+++ b/ansible/roles/swift/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ swift_services }}"
   tags: always
diff --git a/ansible/roles/tacker/tasks/loadbalancer.yml b/ansible/roles/tacker/tasks/loadbalancer.yml
index b53160caa8..13e3f79479 100644
--- a/ansible/roles/tacker/tasks/loadbalancer.yml
+++ b/ansible/roles/tacker/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ tacker_services }}"
   tags: always
diff --git a/ansible/roles/tacker/tasks/stop.yml b/ansible/roles/tacker/tasks/stop.yml
index 026d386a1d..3fcb813482 100644
--- a/ansible/roles/tacker/tasks/stop.yml
+++ b/ansible/roles/tacker/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ tacker_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/telegraf/tasks/stop.yml b/ansible/roles/telegraf/tasks/stop.yml
index e30795e6a0..76dc764ff5 100644
--- a/ansible/roles/telegraf/tasks/stop.yml
+++ b/ansible/roles/telegraf/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ telegraf_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/tempest/tasks/stop.yml b/ansible/roles/tempest/tasks/stop.yml
index 86989d6615..ff41f858b3 100644
--- a/ansible/roles/tempest/tasks/stop.yml
+++ b/ansible/roles/tempest/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ tempest_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/trove/tasks/loadbalancer.yml b/ansible/roles/trove/tasks/loadbalancer.yml
index 1cfff7979a..7a8c3ed28e 100644
--- a/ansible/roles/trove/tasks/loadbalancer.yml
+++ b/ansible/roles/trove/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ trove_services }}"
   tags: always
diff --git a/ansible/roles/trove/tasks/stop.yml b/ansible/roles/trove/tasks/stop.yml
index 35f3021d1c..8cd7545d82 100644
--- a/ansible/roles/trove/tasks/stop.yml
+++ b/ansible/roles/trove/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ trove_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/vitrage/tasks/loadbalancer.yml b/ansible/roles/vitrage/tasks/loadbalancer.yml
index 07fcf7fa07..28696ca39b 100644
--- a/ansible/roles/vitrage/tasks/loadbalancer.yml
+++ b/ansible/roles/vitrage/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ vitrage_services }}"
   tags: always
diff --git a/ansible/roles/vitrage/tasks/stop.yml b/ansible/roles/vitrage/tasks/stop.yml
index 4f5c631bf6..411079e19f 100644
--- a/ansible/roles/vitrage/tasks/stop.yml
+++ b/ansible/roles/vitrage/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ vitrage_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/vmtp/tasks/stop.yml b/ansible/roles/vmtp/tasks/stop.yml
index 3dc1e86830..9af17b721a 100644
--- a/ansible/roles/vmtp/tasks/stop.yml
+++ b/ansible/roles/vmtp/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ vmtp_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/watcher/tasks/loadbalancer.yml b/ansible/roles/watcher/tasks/loadbalancer.yml
index 013a1812e0..ecce5ad2f5 100644
--- a/ansible/roles/watcher/tasks/loadbalancer.yml
+++ b/ansible/roles/watcher/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ watcher_services }}"
   tags: always
diff --git a/ansible/roles/watcher/tasks/stop.yml b/ansible/roles/watcher/tasks/stop.yml
index c0e95da490..f85ed42e7e 100644
--- a/ansible/roles/watcher/tasks/stop.yml
+++ b/ansible/roles/watcher/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ watcher_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/zookeeper/tasks/stop.yml b/ansible/roles/zookeeper/tasks/stop.yml
index 62f198d765..1f2a10437e 100644
--- a/ansible/roles/zookeeper/tasks/stop.yml
+++ b/ansible/roles/zookeeper/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ zookeeper_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/roles/zun/tasks/loadbalancer.yml b/ansible/roles/zun/tasks/loadbalancer.yml
index b6dde18491..a5880a700a 100644
--- a/ansible/roles/zun/tasks/loadbalancer.yml
+++ b/ansible/roles/zun/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure haproxy for {{ project_name }}"
   import_role:
-    role: haproxy-config
+    name: haproxy-config
   vars:
     project_services: "{{ zun_services }}"
   tags: always
diff --git a/ansible/roles/zun/tasks/stop.yml b/ansible/roles/zun/tasks/stop.yml
index f07c93fee6..646317f86e 100644
--- a/ansible/roles/zun/tasks/stop.yml
+++ b/ansible/roles/zun/tasks/stop.yml
@@ -1,6 +1,6 @@
 ---
 - import_role:
-    role: service-stop
+    name: service-stop
   vars:
     project_services: "{{ zun_services }}"
     service_name: "{{ project_name }}"
diff --git a/ansible/site.yml b/ansible/site.yml
index e71f113534..01e443dc23 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -118,195 +118,195 @@
   tasks:
     - block:
         - include_role:
-            role: aodh
+            name: aodh
             tasks_from: loadbalancer
           tags: aodh
           when: enable_aodh | bool
         - include_role:
-            role: barbican
+            name: barbican
             tasks_from: loadbalancer
           tags: barbican
           when: enable_barbican | bool
         - include_role:
-            role: blazar
+            name: blazar
             tasks_from: loadbalancer
           tags: blazar
           when: enable_blazar | bool
         - include_role:
-            role: cinder
+            name: cinder
             tasks_from: loadbalancer
           tags: cinder
           when: enable_cinder | bool
         - include_role:
-            role: cloudkitty
+            name: cloudkitty
             tasks_from: loadbalancer
           tags: cloudkitty
           when: enable_cloudkitty | bool
         - include_role:
-            role: congress
+            name: congress
             tasks_from: loadbalancer
           tags: congress
           when: enable_congress | bool
         - include_role:
-            role: cyborg
+            name: cyborg
             tasks_from: loadbalancer
           tags: cyborg
           when: enable_cyborg | bool
         - include_role:
-            role: designate
+            name: designate
             tasks_from: loadbalancer
           tags: designate
           when: enable_designate | bool
         - include_role:
-            role: elasticsearch
+            name: elasticsearch
             tasks_from: loadbalancer
           tags: elasticsearch
           when: enable_elasticsearch | bool
         - include_role:
-            role: freezer
+            name: freezer
             tasks_from: loadbalancer
           tags: freezer
           when: enable_freezer | bool
         - include_role:
-            role: glance
+            name: glance
             tasks_from: loadbalancer
           tags: glance
           when: enable_glance | bool
         - include_role:
-            role: gnocchi
+            name: gnocchi
             tasks_from: loadbalancer
           tags: gnocchi
           when: enable_gnocchi | bool
         - include_role:
-            role: grafana
+            name: grafana
             tasks_from: loadbalancer
           tags: grafana
           when: enable_grafana | bool
         - include_role:
-            role: heat
+            name: heat
             tasks_from: loadbalancer
           tags: heat
           when: enable_heat | bool
         - include_role:
-            role: horizon
+            name: horizon
             tasks_from: loadbalancer
           tags: horizon
           when: enable_horizon | bool
         - include_role:
-            role: influxdb
+            name: influxdb
             tasks_from: loadbalancer
           tags: influxdb
           when: enable_influxdb | bool
         - include_role:
-            role: ironic
+            name: ironic
             tasks_from: loadbalancer
           tags: ironic
           when: enable_ironic | bool
         - include_role:
-            role: karbor
+            name: karbor
             tasks_from: loadbalancer
           tags: karbor
           when: enable_karbor | bool
         - include_role:
-            role: keystone
+            name: keystone
             tasks_from: loadbalancer
           tags: keystone
           when: enable_keystone | bool
         - include_role:
-            role: kibana
+            name: kibana
             tasks_from: loadbalancer
           tags: kibana
           when: enable_kibana | bool
         - include_role:
-            role: magnum
+            name: magnum
             tasks_from: loadbalancer
           tags: magnum
           when: enable_magnum | bool
         - include_role:
-            role: manila
+            name: manila
             tasks_from: loadbalancer
           tags: manila
           when: enable_manila | bool
         - include_role:
-            role: mariadb
+            name: mariadb
             tasks_from: loadbalancer
           tags: mariadb
           when: enable_mariadb | bool or enable_external_mariadb_load_balancer | bool
         - include_role:
-            role: masakari
+            name: masakari
             tasks_from: loadbalancer
           tags: masakari
           when: enable_masakari | bool
         - include_role:
-            role: memcached
+            name: memcached
             tasks_from: loadbalancer
           tags: memcached
           when: enable_memcached | bool
         - include_role:
-            role: mistral
+            name: mistral
             tasks_from: loadbalancer
           tags: mistral
           when: enable_mistral | bool
         - include_role:
-            role: monasca
+            name: monasca
             tasks_from: loadbalancer
           tags: monasca
           when: enable_monasca | bool
         - include_role:
-            role: mongodb
+            name: mongodb
             tasks_from: loadbalancer
           tags: mongodb
           when: enable_mongodb | bool
         - include_role:
-            role: murano
+            name: murano
             tasks_from: loadbalancer
           tags: murano
           when: enable_murano | bool
         - include_role:
-            role: neutron
+            name: neutron
             tasks_from: loadbalancer
           tags: neutron
           when: enable_neutron | bool
         - include_role:
-            role: placement
+            name: placement
             tasks_from: loadbalancer
           tags: placement
         - include_role:
-            role: nova
+            name: nova
             tasks_from: loadbalancer
           tags:
             - nova
             - nova-api
           when: enable_nova | bool
         - include_role:
-            role: nova-cell
+            name: nova-cell
             tasks_from: loadbalancer
           tags:
             - nova
             - nova-cell
           when: enable_nova | bool
         - include_role:
-            role: octavia
+            name: octavia
             tasks_from: loadbalancer
           tags: octavia
           when: enable_octavia | bool
         - include_role:
-            role: panko
+            name: panko
             tasks_from: loadbalancer
           tags: panko
           when: enable_panko | bool
         - include_role:
-            role: prometheus
+            name: prometheus
             tasks_from: loadbalancer
           tags: prometheus
           when: enable_prometheus | bool
         - include_role:
-            role: qinling
+            name: qinling
             tasks_from: loadbalancer
           tags: qinling
           when: enable_qinling | bool
         - include_role:
-            role: rabbitmq
+            name: rabbitmq
             tasks_from: loadbalancer
           tags: rabbitmq
           vars:
@@ -314,57 +314,57 @@
             role_rabbitmq_groups:
           when: enable_rabbitmq | bool or enable_outward_rabbitmq | bool
         - include_role:
-            role: sahara
+            name: sahara
             tasks_from: loadbalancer
           tags: sahara
           when: enable_sahara | bool
         - include_role:
-            role: searchlight
+            name: searchlight
             tasks_from: loadbalancer
           tags: searchlight
           when: enable_searchlight | bool
         - include_role:
-            role: senlin
+            name: senlin
             tasks_from: loadbalancer
           tags: senlin
           when: enable_senlin | bool
         - include_role:
-            role: skydive
+            name: skydive
             tasks_from: loadbalancer
           tags: skydive
           when: enable_skydive | bool
         - include_role:
-            role: solum
+            name: solum
             tasks_from: loadbalancer
           tags: solum
           when: enable_solum | bool
         - include_role:
-            role: swift
+            name: swift
             tasks_from: loadbalancer
           tags: swift
           when: enable_swift | bool
         - include_role:
-            role: tacker
+            name: tacker
             tasks_from: loadbalancer
           tags: tacker
           when: enable_tacker | bool
         - include_role:
-            role: trove
+            name: trove
             tasks_from: loadbalancer
           tags: trove
           when: enable_trove | bool
         - include_role:
-            role: vitrage
+            name: vitrage
             tasks_from: loadbalancer
           tags: vitrage
           when: enable_vitrage | bool
         - include_role:
-            role: watcher
+            name: watcher
             tasks_from: loadbalancer
           tags: watcher
           when: enable_watcher | bool
         - include_role:
-            role: zun
+            name: zun
             tasks_from: loadbalancer
           tags: zun
           when: enable_zun | bool