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

124 files changed, 174 insertions, 174 deletions

diff --git a/ansible/nova.yml b/ansible/nova.yml
index 311a0bb69..bab698399 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 2e4ead6dd..b66ad26c9 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 6a30bf063..122b6beee 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 f7a415e26..2565578cb 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 928bfba7a..a6560189c 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 bd95ef516..79dd48743 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 fe151a027..62431fde1 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 03883ff36..db8c75801 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 16dd82c0e..e8070be96 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 7de1a95d7..6424c5a2f 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 4119b9fd0..5f3b9fc8b 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 22c0f2656..def3d155a 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 01794e868..93bdf8952 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 3b2aaf7e4..141f3b3f2 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 5c985b80d..4e271bfd3 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 8c2f0dbda..89d66300a 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 971b7583a..1d7b47787 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 87085221f..2a5eb4797 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 b8e2a76b8..6ddefc01a 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 166323f5a..a7b44c9c3 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 bdf431f56..02eab8afa 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 bbf5ce56b..fee24e492 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 b68d9184d..45cf86b47 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 7e95c94d6..dbe0cdb9b 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 cd9f745de..cb39b3d79 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 96ece25ef..36efea057 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 8f0ce1a7d..ed8f3197f 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 2535c4dd7..b77c440a4 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 5bff18593..1469409b3 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 74c484277..0f61db204 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 4a7696c08..82ba9c8e5 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 53b0f1e51..fd215a32d 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 aa5d0f641..cb70188ba 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 ddce7154e..020b523ad 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 5211a14f6..99584bf2d 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 4a16fc14c..da37990bd 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 4a8e5781a..ed10425a2 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 37a0ac777..f4fd8cca3 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 29d340ee9..5c0194eb4 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 c337f924c..af4e492ed 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 5dc896f19..b3a7155d1 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 aef5c515e..a8db78370 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 85fb1e65a..6bda5f701 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 13fc08797..e828958c6 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 f52b76f38..2ede1b9cb 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 4ddb12f67..17f71e00c 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 54775a058..0db3f1ec1 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 8983ab529..954388aa9 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 446311065..fd6ed4cf3 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 e3b452aef..9112f4f74 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 5c5034a46..878fb7e67 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 674769b35..bc445e3bf 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 0356c77cd..9de5560e4 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 0e6c3504d..93d8874c2 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 9204d82f7..91f201a18 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 a65735642..07f2d2368 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 c72b8f0b7..5f461beae 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 d60e30573..f70237bd6 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 7154eca6a..0eed33fd0 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 9aca7ac74..2b0706581 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 b21c7632a..4ddf84710 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 2ca860f3c..2535818ab 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 2dd1f3ccd..7a1c327cb 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 e5feb2222..3f85f2e00 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 2aa16b070..1c8cd4b09 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 d387236b9..362d50766 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 070834d4e..6b04bf10d 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 47d98263f..b1085e166 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 4a3da5c3e..b11ea424e 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 383564e8f..66a7d46e1 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 7fa492b73..8619ed971 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 e395fe4c0..8e110ef99 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 c28ef33a7..8cd917a6e 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 aaa85b1e6..4ad32c259 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 8c030e9e8..6e3ad940b 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 1be4866bc..80c8f7cd0 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 49d6ee927..34c08e055 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 32b58e292..21851745a 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 b3cad5198..3cee9118e 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 543f284cb..57eba01cc 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 f6a48244e..1e4aefe24 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 4b5294bc4..3069071d1 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 c6c8ca282..b0ecb2fac 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 a5a8a02e5..71fda73ac 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 53016b9de..1b4f51815 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 3d4fec5c3..5875cb4fc 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 9b6b8970a..41c052cb1 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 eb98f416f..03da58a45 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 8f0161af6..794798f14 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 cda4198a6..18d4f9bc5 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 a466a87ff..06338ec17 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 4b0b6ccbf..5d33b5d65 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 c3a4142ac..2402dfe38 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 918c7796e..584160263 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 f13c35e51..1b6e3517b 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 792d4ccfe..ca8ea8080 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 d4566d02e..452b62ffb 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 b8c3edb54..235c7b1df 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 02c3e6a90..28c1c535b 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 b911642e5..5f38f2a06 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 d6f795395..7ad29acfd 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 47b2c0d14..7fed6aa11 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 336538ad2..93b8215b6 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 74078cd39..a75d3ee3e 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 a6e363029..93397a2de 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 f6d8ed861..12c053855 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 2667cb922..5018e56e6 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 2bc5681d6..eba1e5b2a 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 7393ec932..f5e6b15f8 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 b53160caa..13e3f7947 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 026d386a1..3fcb81348 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 e30795e6a..76dc764ff 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 86989d661..ff41f858b 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 1cfff7979..7a8c3ed28 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 35f3021d1..8cd7545d8 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 07fcf7fa0..28696ca39 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 4f5c631bf..411079e19 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 3dc1e8683..9af17b721 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 013a1812e..ecce5ad2f 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 c0e95da49..f85ed42e7 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 62f198d76..1f2a10437 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 b6dde1849..a5880a700 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 f07c93fee..646317f86 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 e71f11353..01e443dc2 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