From 229c3ad585752f9157791d541ad380196d786765 Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Mon, 22 Nov 2021 08:26:57 +0100
Subject: [PATCH] Move project_name and kolla_role_name to role vars

Role vars have a higher precedence than role defaults. This allows to
import default vars from another role via vars_files without overriding
project_name (see closed bug for details).

Compared to victoria, this cherry picked change includes the congress,
mongodb and nova-hyperv roles.

Change-Id: I3d919736e53d6f3e1a70d1267cf42c8d2c0ad221
Closes-Bug: #1951785
(cherry picked from commit 56fc74f23150a9be0c88518ec98bc6a2848ff168)
(cherry picked from commit 6c695564bcb29792460ae54aaac2b3b2a6096578)
(cherry picked from commit 6cb0e1062605b4f0f9aeb9884d25a36c91b4bed7)
(cherry picked from commit 145e64d5ca00374ad9ef86a103624db9a5e6642e)
---
 ansible/roles/aodh/defaults/main.yml           | 2 --
 ansible/roles/aodh/vars/main.yml               | 2 ++
 ansible/roles/barbican/defaults/main.yml       | 2 --
 ansible/roles/barbican/vars/main.yml           | 2 ++
 ansible/roles/bifrost/defaults/main.yml        | 2 --
 ansible/roles/bifrost/vars/main.yml            | 2 ++
 ansible/roles/blazar/defaults/main.yml         | 2 --
 ansible/roles/blazar/vars/main.yml             | 2 ++
 ansible/roles/ceilometer/defaults/main.yml     | 2 --
 ansible/roles/ceilometer/vars/main.yml         | 2 ++
 ansible/roles/chrony/defaults/main.yml         | 2 --
 ansible/roles/chrony/vars/main.yml             | 2 ++
 ansible/roles/cinder/defaults/main.yml         | 2 --
 ansible/roles/cinder/vars/main.yml             | 2 ++
 ansible/roles/cloudkitty/defaults/main.yml     | 2 --
 ansible/roles/cloudkitty/vars/main.yml         | 2 ++
 ansible/roles/collectd/defaults/main.yml       | 2 --
 ansible/roles/collectd/vars/main.yml           | 2 ++
 ansible/roles/common/defaults/main.yml         | 2 --
 ansible/roles/common/vars/main.yml             | 2 ++
 ansible/roles/congress/defaults/main.yml       | 2 --
 ansible/roles/congress/vars/main.yml           | 2 ++
 ansible/roles/cyborg/defaults/main.yml         | 2 --
 ansible/roles/cyborg/vars/main.yml             | 2 ++
 ansible/roles/designate/defaults/main.yml      | 2 --
 ansible/roles/designate/vars/main.yml          | 2 ++
 ansible/roles/elasticsearch/defaults/main.yml  | 2 --
 ansible/roles/elasticsearch/vars/main.yml      | 2 ++
 ansible/roles/etcd/defaults/main.yml           | 2 --
 ansible/roles/etcd/vars/main.yml               | 2 ++
 ansible/roles/freezer/defaults/main.yml        | 2 --
 ansible/roles/freezer/vars/main.yml            | 2 ++
 ansible/roles/glance/defaults/main.yml         | 2 --
 ansible/roles/glance/vars/main.yml             | 2 ++
 ansible/roles/gnocchi/defaults/main.yml        | 2 --
 ansible/roles/gnocchi/vars/main.yml            | 2 ++
 ansible/roles/grafana/defaults/main.yml        | 2 --
 ansible/roles/grafana/vars/main.yml            | 2 ++
 ansible/roles/haproxy-config/defaults/main.yml | 2 --
 ansible/roles/haproxy-config/vars/main.yml     | 2 ++
 ansible/roles/haproxy/defaults/main.yml        | 2 --
 ansible/roles/haproxy/vars/main.yml            | 2 ++
 ansible/roles/heat/defaults/main.yml           | 2 --
 ansible/roles/heat/vars/main.yml               | 2 ++
 ansible/roles/horizon/defaults/main.yml        | 2 --
 ansible/roles/horizon/vars/main.yml            | 2 ++
 ansible/roles/influxdb/defaults/main.yml       | 2 --
 ansible/roles/influxdb/vars/main.yml           | 2 ++
 ansible/roles/ironic/defaults/main.yml         | 2 --
 ansible/roles/ironic/vars/main.yml             | 2 ++
 ansible/roles/iscsi/defaults/main.yml          | 2 --
 ansible/roles/iscsi/vars/main.yml              | 2 ++
 ansible/roles/kafka/defaults/main.yml          | 2 --
 ansible/roles/kafka/vars/main.yml              | 2 ++
 ansible/roles/karbor/defaults/main.yml         | 2 --
 ansible/roles/karbor/vars/main.yml             | 2 ++
 ansible/roles/keystone/defaults/main.yml       | 2 --
 ansible/roles/keystone/vars/main.yml           | 2 ++
 ansible/roles/kibana/defaults/main.yml         | 2 --
 ansible/roles/kibana/vars/main.yml             | 2 ++
 ansible/roles/kuryr/defaults/main.yml          | 1 -
 ansible/roles/kuryr/vars/main.yml              | 2 ++
 ansible/roles/magnum/defaults/main.yml         | 2 --
 ansible/roles/magnum/vars/main.yml             | 2 ++
 ansible/roles/manila/defaults/main.yml         | 2 --
 ansible/roles/manila/vars/main.yml             | 2 ++
 ansible/roles/mariadb/defaults/main.yml        | 2 --
 ansible/roles/mariadb/vars/main.yml            | 2 ++
 ansible/roles/masakari/defaults/main.yml       | 2 --
 ansible/roles/masakari/vars/main.yml           | 2 ++
 ansible/roles/memcached/defaults/main.yml      | 2 --
 ansible/roles/memcached/vars/main.yml          | 2 ++
 ansible/roles/mistral/defaults/main.yml        | 2 --
 ansible/roles/mistral/vars/main.yml            | 2 ++
 ansible/roles/monasca/defaults/main.yml        | 2 --
 ansible/roles/monasca/vars/main.yml            | 2 ++
 ansible/roles/mongodb/defaults/main.yml        | 2 --
 ansible/roles/mongodb/vars/main.yml            | 2 ++
 ansible/roles/multipathd/defaults/main.yml     | 2 --
 ansible/roles/multipathd/vars/main.yml         | 2 ++
 ansible/roles/murano/defaults/main.yml         | 2 --
 ansible/roles/murano/vars/main.yml             | 2 ++
 ansible/roles/neutron/defaults/main.yml        | 2 --
 ansible/roles/neutron/vars/main.yml            | 2 ++
 ansible/roles/nova-cell/defaults/main.yml      | 6 ------
 ansible/roles/nova-cell/vars/main.yml          | 6 ++++++
 ansible/roles/nova-hyperv/defaults/main.yml    | 2 --
 ansible/roles/nova-hyperv/vars/main.yml        | 2 ++
 ansible/roles/nova/defaults/main.yml           | 2 --
 ansible/roles/nova/vars/main.yml               | 2 ++
 ansible/roles/octavia/defaults/main.yml        | 2 --
 ansible/roles/octavia/vars/main.yml            | 2 ++
 ansible/roles/openvswitch/defaults/main.yml    | 2 --
 ansible/roles/openvswitch/vars/main.yml        | 2 ++
 ansible/roles/ovn/defaults/main.yml            | 2 --
 ansible/roles/ovn/vars/main.yml                | 2 ++
 ansible/roles/ovs-dpdk/defaults/main.yml       | 1 -
 ansible/roles/ovs-dpdk/vars/main.yml           | 2 ++
 ansible/roles/panko/defaults/main.yml          | 2 --
 ansible/roles/panko/vars/main.yml              | 2 ++
 ansible/roles/placement/defaults/main.yml      | 2 --
 ansible/roles/placement/vars/main.yml          | 2 ++
 ansible/roles/prometheus/defaults/main.yml     | 2 --
 ansible/roles/prometheus/vars/main.yml         | 2 ++
 ansible/roles/qdrouterd/defaults/main.yml      | 2 --
 ansible/roles/qdrouterd/vars/main.yml          | 2 ++
 ansible/roles/qinling/defaults/main.yml        | 2 --
 ansible/roles/qinling/vars/main.yml            | 2 ++
 ansible/roles/rabbitmq/defaults/main.yml       | 2 --
 ansible/roles/rabbitmq/vars/main.yml           | 2 ++
 ansible/roles/rally/defaults/main.yml          | 2 --
 ansible/roles/rally/vars/main.yml              | 2 ++
 ansible/roles/redis/defaults/main.yml          | 2 --
 ansible/roles/redis/vars/main.yml              | 2 ++
 ansible/roles/sahara/defaults/main.yml         | 2 --
 ansible/roles/sahara/vars/main.yml             | 2 ++
 ansible/roles/searchlight/defaults/main.yml    | 2 --
 ansible/roles/searchlight/vars/main.yml        | 2 ++
 ansible/roles/senlin/defaults/main.yml         | 2 --
 ansible/roles/senlin/vars/main.yml             | 2 ++
 ansible/roles/skydive/defaults/main.yml        | 2 --
 ansible/roles/skydive/vars/main.yml            | 2 ++
 ansible/roles/solum/defaults/main.yml          | 2 --
 ansible/roles/solum/vars/main.yml              | 2 ++
 ansible/roles/storm/defaults/main.yml          | 2 --
 ansible/roles/storm/vars/main.yml              | 2 ++
 ansible/roles/swift/defaults/main.yml          | 2 --
 ansible/roles/swift/vars/main.yml              | 2 ++
 ansible/roles/tacker/defaults/main.yml         | 2 --
 ansible/roles/tacker/vars/main.yml             | 2 ++
 ansible/roles/telegraf/defaults/main.yml       | 2 --
 ansible/roles/telegraf/vars/main.yml           | 2 ++
 ansible/roles/tempest/defaults/main.yml        | 2 --
 ansible/roles/tempest/vars/main.yml            | 2 ++
 ansible/roles/trove/defaults/main.yml          | 2 --
 ansible/roles/trove/vars/main.yml              | 2 ++
 ansible/roles/vitrage/defaults/main.yml        | 2 --
 ansible/roles/vitrage/vars/main.yml            | 2 ++
 ansible/roles/vmtp/defaults/main.yml           | 2 --
 ansible/roles/vmtp/vars/main.yml               | 2 ++
 ansible/roles/watcher/defaults/main.yml        | 2 --
 ansible/roles/watcher/vars/main.yml            | 2 ++
 ansible/roles/zookeeper/defaults/main.yml      | 2 --
 ansible/roles/zookeeper/vars/main.yml          | 2 ++
 ansible/roles/zun/defaults/main.yml            | 2 --
 ansible/roles/zun/vars/main.yml                | 2 ++
 146 files changed, 150 insertions(+), 148 deletions(-)
 create mode 100644 ansible/roles/aodh/vars/main.yml
 create mode 100644 ansible/roles/barbican/vars/main.yml
 create mode 100644 ansible/roles/bifrost/vars/main.yml
 create mode 100644 ansible/roles/blazar/vars/main.yml
 create mode 100644 ansible/roles/ceilometer/vars/main.yml
 create mode 100644 ansible/roles/chrony/vars/main.yml
 create mode 100644 ansible/roles/cinder/vars/main.yml
 create mode 100644 ansible/roles/cloudkitty/vars/main.yml
 create mode 100644 ansible/roles/collectd/vars/main.yml
 create mode 100644 ansible/roles/common/vars/main.yml
 create mode 100644 ansible/roles/congress/vars/main.yml
 create mode 100644 ansible/roles/cyborg/vars/main.yml
 create mode 100644 ansible/roles/designate/vars/main.yml
 create mode 100644 ansible/roles/elasticsearch/vars/main.yml
 create mode 100644 ansible/roles/etcd/vars/main.yml
 create mode 100644 ansible/roles/freezer/vars/main.yml
 create mode 100644 ansible/roles/glance/vars/main.yml
 create mode 100644 ansible/roles/gnocchi/vars/main.yml
 create mode 100644 ansible/roles/grafana/vars/main.yml
 create mode 100644 ansible/roles/haproxy-config/vars/main.yml
 create mode 100644 ansible/roles/haproxy/vars/main.yml
 create mode 100644 ansible/roles/heat/vars/main.yml
 create mode 100644 ansible/roles/horizon/vars/main.yml
 create mode 100644 ansible/roles/influxdb/vars/main.yml
 create mode 100644 ansible/roles/ironic/vars/main.yml
 create mode 100644 ansible/roles/iscsi/vars/main.yml
 create mode 100644 ansible/roles/kafka/vars/main.yml
 create mode 100644 ansible/roles/karbor/vars/main.yml
 create mode 100644 ansible/roles/keystone/vars/main.yml
 create mode 100644 ansible/roles/kibana/vars/main.yml
 create mode 100644 ansible/roles/kuryr/vars/main.yml
 create mode 100644 ansible/roles/magnum/vars/main.yml
 create mode 100644 ansible/roles/manila/vars/main.yml
 create mode 100644 ansible/roles/mariadb/vars/main.yml
 create mode 100644 ansible/roles/masakari/vars/main.yml
 create mode 100644 ansible/roles/memcached/vars/main.yml
 create mode 100644 ansible/roles/mistral/vars/main.yml
 create mode 100644 ansible/roles/monasca/vars/main.yml
 create mode 100644 ansible/roles/mongodb/vars/main.yml
 create mode 100644 ansible/roles/multipathd/vars/main.yml
 create mode 100644 ansible/roles/murano/vars/main.yml
 create mode 100644 ansible/roles/neutron/vars/main.yml
 create mode 100644 ansible/roles/nova-cell/vars/main.yml
 create mode 100644 ansible/roles/nova-hyperv/vars/main.yml
 create mode 100644 ansible/roles/nova/vars/main.yml
 create mode 100644 ansible/roles/octavia/vars/main.yml
 create mode 100644 ansible/roles/openvswitch/vars/main.yml
 create mode 100644 ansible/roles/ovn/vars/main.yml
 create mode 100644 ansible/roles/ovs-dpdk/vars/main.yml
 create mode 100644 ansible/roles/panko/vars/main.yml
 create mode 100644 ansible/roles/placement/vars/main.yml
 create mode 100644 ansible/roles/prometheus/vars/main.yml
 create mode 100644 ansible/roles/qdrouterd/vars/main.yml
 create mode 100644 ansible/roles/qinling/vars/main.yml
 create mode 100644 ansible/roles/rabbitmq/vars/main.yml
 create mode 100644 ansible/roles/rally/vars/main.yml
 create mode 100644 ansible/roles/redis/vars/main.yml
 create mode 100644 ansible/roles/sahara/vars/main.yml
 create mode 100644 ansible/roles/searchlight/vars/main.yml
 create mode 100644 ansible/roles/senlin/vars/main.yml
 create mode 100644 ansible/roles/skydive/vars/main.yml
 create mode 100644 ansible/roles/solum/vars/main.yml
 create mode 100644 ansible/roles/storm/vars/main.yml
 create mode 100644 ansible/roles/swift/vars/main.yml
 create mode 100644 ansible/roles/tacker/vars/main.yml
 create mode 100644 ansible/roles/telegraf/vars/main.yml
 create mode 100644 ansible/roles/tempest/vars/main.yml
 create mode 100644 ansible/roles/trove/vars/main.yml
 create mode 100644 ansible/roles/vitrage/vars/main.yml
 create mode 100644 ansible/roles/vmtp/vars/main.yml
 create mode 100644 ansible/roles/watcher/vars/main.yml
 create mode 100644 ansible/roles/zookeeper/vars/main.yml
 create mode 100644 ansible/roles/zun/vars/main.yml

diff --git a/ansible/roles/aodh/defaults/main.yml b/ansible/roles/aodh/defaults/main.yml
index 5d48c32d0c..9e954bafa9 100644
--- a/ansible/roles/aodh/defaults/main.yml
+++ b/ansible/roles/aodh/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "aodh"
-
 aodh_services:
   aodh-api:
     container_name: aodh_api
diff --git a/ansible/roles/aodh/vars/main.yml b/ansible/roles/aodh/vars/main.yml
new file mode 100644
index 0000000000..c668a7d9e1
--- /dev/null
+++ b/ansible/roles/aodh/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "aodh"
diff --git a/ansible/roles/barbican/defaults/main.yml b/ansible/roles/barbican/defaults/main.yml
index d695140596..b7a4d13a79 100644
--- a/ansible/roles/barbican/defaults/main.yml
+++ b/ansible/roles/barbican/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "barbican"
-
 barbican_services:
   barbican-api:
     container_name: barbican_api
diff --git a/ansible/roles/barbican/vars/main.yml b/ansible/roles/barbican/vars/main.yml
new file mode 100644
index 0000000000..db2929f0c1
--- /dev/null
+++ b/ansible/roles/barbican/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "barbican"
diff --git a/ansible/roles/bifrost/defaults/main.yml b/ansible/roles/bifrost/defaults/main.yml
index 6be3d6cf83..44a825e3c6 100644
--- a/ansible/roles/bifrost/defaults/main.yml
+++ b/ansible/roles/bifrost/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "bifrost"
-
 ####################
 # Docker
 ####################
diff --git a/ansible/roles/bifrost/vars/main.yml b/ansible/roles/bifrost/vars/main.yml
new file mode 100644
index 0000000000..7e02236d41
--- /dev/null
+++ b/ansible/roles/bifrost/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "bifrost"
diff --git a/ansible/roles/blazar/defaults/main.yml b/ansible/roles/blazar/defaults/main.yml
index fadfbda9d2..1083f81732 100644
--- a/ansible/roles/blazar/defaults/main.yml
+++ b/ansible/roles/blazar/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "blazar"
-
 blazar_services:
   blazar-api:
     container_name: blazar_api
diff --git a/ansible/roles/blazar/vars/main.yml b/ansible/roles/blazar/vars/main.yml
new file mode 100644
index 0000000000..7a713cb44e
--- /dev/null
+++ b/ansible/roles/blazar/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "blazar"
diff --git a/ansible/roles/ceilometer/defaults/main.yml b/ansible/roles/ceilometer/defaults/main.yml
index e52b6881bb..95cafbb7e9 100644
--- a/ansible/roles/ceilometer/defaults/main.yml
+++ b/ansible/roles/ceilometer/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "ceilometer"
-
 ceilometer_services:
   ceilometer-notification:
     container_name: ceilometer_notification
diff --git a/ansible/roles/ceilometer/vars/main.yml b/ansible/roles/ceilometer/vars/main.yml
new file mode 100644
index 0000000000..bd9a841f79
--- /dev/null
+++ b/ansible/roles/ceilometer/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "ceilometer"
diff --git a/ansible/roles/chrony/defaults/main.yml b/ansible/roles/chrony/defaults/main.yml
index e74cb135a0..5c1fc5c9b9 100644
--- a/ansible/roles/chrony/defaults/main.yml
+++ b/ansible/roles/chrony/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "chrony"
-
 chrony_services:
   chrony:
     container_name: "chrony"
diff --git a/ansible/roles/chrony/vars/main.yml b/ansible/roles/chrony/vars/main.yml
new file mode 100644
index 0000000000..9530b5c7c6
--- /dev/null
+++ b/ansible/roles/chrony/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "chrony"
diff --git a/ansible/roles/cinder/defaults/main.yml b/ansible/roles/cinder/defaults/main.yml
index d2e9de95ea..22e654d73b 100644
--- a/ansible/roles/cinder/defaults/main.yml
+++ b/ansible/roles/cinder/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "cinder"
-
 cinder_services:
   cinder-api:
     container_name: cinder_api
diff --git a/ansible/roles/cinder/vars/main.yml b/ansible/roles/cinder/vars/main.yml
new file mode 100644
index 0000000000..d79f9dcbbb
--- /dev/null
+++ b/ansible/roles/cinder/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "cinder"
diff --git a/ansible/roles/cloudkitty/defaults/main.yml b/ansible/roles/cloudkitty/defaults/main.yml
index 901789f334..b4ee9cddf6 100644
--- a/ansible/roles/cloudkitty/defaults/main.yml
+++ b/ansible/roles/cloudkitty/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "cloudkitty"
-
 cloudkitty_services:
   cloudkitty-api:
     container_name: "cloudkitty_api"
diff --git a/ansible/roles/cloudkitty/vars/main.yml b/ansible/roles/cloudkitty/vars/main.yml
new file mode 100644
index 0000000000..84fc6ec07d
--- /dev/null
+++ b/ansible/roles/cloudkitty/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "cloudkitty"
diff --git a/ansible/roles/collectd/defaults/main.yml b/ansible/roles/collectd/defaults/main.yml
index f9bd7d6a0a..36a358e2d6 100644
--- a/ansible/roles/collectd/defaults/main.yml
+++ b/ansible/roles/collectd/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "collectd"
-
 collectd_services:
   collectd:
     container_name: collectd
diff --git a/ansible/roles/collectd/vars/main.yml b/ansible/roles/collectd/vars/main.yml
new file mode 100644
index 0000000000..f891752463
--- /dev/null
+++ b/ansible/roles/collectd/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "collectd"
diff --git a/ansible/roles/common/defaults/main.yml b/ansible/roles/common/defaults/main.yml
index ca0185fa1a..ad6c2407aa 100644
--- a/ansible/roles/common/defaults/main.yml
+++ b/ansible/roles/common/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "common"
-
 # Due to the way we do our inventory, ansible does not pick up on the fact that
 # this role has already run. We can track what has run with host facts.
 common_run: False
diff --git a/ansible/roles/common/vars/main.yml b/ansible/roles/common/vars/main.yml
new file mode 100644
index 0000000000..df0a76fc2b
--- /dev/null
+++ b/ansible/roles/common/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "common"
diff --git a/ansible/roles/congress/defaults/main.yml b/ansible/roles/congress/defaults/main.yml
index a9f53d20ab..1940adfe9c 100644
--- a/ansible/roles/congress/defaults/main.yml
+++ b/ansible/roles/congress/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "congress"
-
 congress_services:
   congress-api:
     container_name: congress_api
diff --git a/ansible/roles/congress/vars/main.yml b/ansible/roles/congress/vars/main.yml
new file mode 100644
index 0000000000..8aba271fbf
--- /dev/null
+++ b/ansible/roles/congress/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "congress"
diff --git a/ansible/roles/cyborg/defaults/main.yml b/ansible/roles/cyborg/defaults/main.yml
index 871e66b01a..8d11ce1cb4 100644
--- a/ansible/roles/cyborg/defaults/main.yml
+++ b/ansible/roles/cyborg/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "cyborg"
-
 cyborg_services:
   cyborg-api:
     container_name: cyborg_api
diff --git a/ansible/roles/cyborg/vars/main.yml b/ansible/roles/cyborg/vars/main.yml
new file mode 100644
index 0000000000..256850cc2c
--- /dev/null
+++ b/ansible/roles/cyborg/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "cyborg"
diff --git a/ansible/roles/designate/defaults/main.yml b/ansible/roles/designate/defaults/main.yml
index f024a99469..1bdac5e62b 100644
--- a/ansible/roles/designate/defaults/main.yml
+++ b/ansible/roles/designate/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "designate"
-
 designate_services:
   designate-api:
     container_name: designate_api
diff --git a/ansible/roles/designate/vars/main.yml b/ansible/roles/designate/vars/main.yml
new file mode 100644
index 0000000000..6075c8817d
--- /dev/null
+++ b/ansible/roles/designate/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "designate"
diff --git a/ansible/roles/elasticsearch/defaults/main.yml b/ansible/roles/elasticsearch/defaults/main.yml
index a4f2d0da1b..94d88308a1 100644
--- a/ansible/roles/elasticsearch/defaults/main.yml
+++ b/ansible/roles/elasticsearch/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "elasticsearch"
-
 elasticsearch_services:
   elasticsearch:
     container_name: elasticsearch
diff --git a/ansible/roles/elasticsearch/vars/main.yml b/ansible/roles/elasticsearch/vars/main.yml
new file mode 100644
index 0000000000..6c47bd5f9b
--- /dev/null
+++ b/ansible/roles/elasticsearch/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "elasticsearch"
diff --git a/ansible/roles/etcd/defaults/main.yml b/ansible/roles/etcd/defaults/main.yml
index 13bca18c44..15644a218f 100644
--- a/ansible/roles/etcd/defaults/main.yml
+++ b/ansible/roles/etcd/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "etcd"
-
 etcd_services:
   etcd:
     container_name: etcd
diff --git a/ansible/roles/etcd/vars/main.yml b/ansible/roles/etcd/vars/main.yml
new file mode 100644
index 0000000000..427d8ea17a
--- /dev/null
+++ b/ansible/roles/etcd/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "etcd"
diff --git a/ansible/roles/freezer/defaults/main.yml b/ansible/roles/freezer/defaults/main.yml
index ed1f94e57e..bd67a90e10 100644
--- a/ansible/roles/freezer/defaults/main.yml
+++ b/ansible/roles/freezer/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "freezer"
-
 freezer_services:
   freezer-api:
     container_name: freezer_api
diff --git a/ansible/roles/freezer/vars/main.yml b/ansible/roles/freezer/vars/main.yml
new file mode 100644
index 0000000000..20fbc8f5f5
--- /dev/null
+++ b/ansible/roles/freezer/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "freezer"
diff --git a/ansible/roles/glance/defaults/main.yml b/ansible/roles/glance/defaults/main.yml
index e1582d180b..34e15d43d0 100644
--- a/ansible/roles/glance/defaults/main.yml
+++ b/ansible/roles/glance/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "glance"
-
 glance_services:
   glance-api:
     container_name: glance_api
diff --git a/ansible/roles/glance/vars/main.yml b/ansible/roles/glance/vars/main.yml
new file mode 100644
index 0000000000..dcf6b70cc0
--- /dev/null
+++ b/ansible/roles/glance/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "glance"
diff --git a/ansible/roles/gnocchi/defaults/main.yml b/ansible/roles/gnocchi/defaults/main.yml
index 6ec5315d56..3c7004551b 100644
--- a/ansible/roles/gnocchi/defaults/main.yml
+++ b/ansible/roles/gnocchi/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "gnocchi"
-
 gnocchi_services:
   gnocchi-api:
     container_name: gnocchi_api
diff --git a/ansible/roles/gnocchi/vars/main.yml b/ansible/roles/gnocchi/vars/main.yml
new file mode 100644
index 0000000000..ad23b1121d
--- /dev/null
+++ b/ansible/roles/gnocchi/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "gnocchi"
diff --git a/ansible/roles/grafana/defaults/main.yml b/ansible/roles/grafana/defaults/main.yml
index 2503f61233..808cad40ad 100644
--- a/ansible/roles/grafana/defaults/main.yml
+++ b/ansible/roles/grafana/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "grafana"
-
 grafana_services:
   grafana:
     container_name: grafana
diff --git a/ansible/roles/grafana/vars/main.yml b/ansible/roles/grafana/vars/main.yml
new file mode 100644
index 0000000000..f4e2990a2a
--- /dev/null
+++ b/ansible/roles/grafana/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "grafana"
diff --git a/ansible/roles/haproxy-config/defaults/main.yml b/ansible/roles/haproxy-config/defaults/main.yml
index 97ef2a0998..d8882e4b10 100644
--- a/ansible/roles/haproxy-config/defaults/main.yml
+++ b/ansible/roles/haproxy-config/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "haproxy-config"
-
 haproxy_service_template: "haproxy_single_service_listen.cfg.j2"
 
 # Extra frontend/backend options (additive with locally defined options)
diff --git a/ansible/roles/haproxy-config/vars/main.yml b/ansible/roles/haproxy-config/vars/main.yml
new file mode 100644
index 0000000000..d44c66f7fe
--- /dev/null
+++ b/ansible/roles/haproxy-config/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "haproxy-config"
diff --git a/ansible/roles/haproxy/defaults/main.yml b/ansible/roles/haproxy/defaults/main.yml
index 13339b1875..20eaee230c 100644
--- a/ansible/roles/haproxy/defaults/main.yml
+++ b/ansible/roles/haproxy/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "haproxy"
-
 haproxy_services:
   haproxy:
     container_name: haproxy
diff --git a/ansible/roles/haproxy/vars/main.yml b/ansible/roles/haproxy/vars/main.yml
new file mode 100644
index 0000000000..567684bdeb
--- /dev/null
+++ b/ansible/roles/haproxy/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "haproxy"
diff --git a/ansible/roles/heat/defaults/main.yml b/ansible/roles/heat/defaults/main.yml
index 8fe0978a3e..9cf90564f5 100644
--- a/ansible/roles/heat/defaults/main.yml
+++ b/ansible/roles/heat/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "heat"
-
 heat_services:
   heat-api:
     container_name: heat_api
diff --git a/ansible/roles/heat/vars/main.yml b/ansible/roles/heat/vars/main.yml
new file mode 100644
index 0000000000..386d9ca0bc
--- /dev/null
+++ b/ansible/roles/heat/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "heat"
diff --git a/ansible/roles/horizon/defaults/main.yml b/ansible/roles/horizon/defaults/main.yml
index 14df9e79f8..506e81e181 100644
--- a/ansible/roles/horizon/defaults/main.yml
+++ b/ansible/roles/horizon/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "horizon"
-
 horizon_services:
   horizon:
     container_name: horizon
diff --git a/ansible/roles/horizon/vars/main.yml b/ansible/roles/horizon/vars/main.yml
new file mode 100644
index 0000000000..70865bc830
--- /dev/null
+++ b/ansible/roles/horizon/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "horizon"
diff --git a/ansible/roles/influxdb/defaults/main.yml b/ansible/roles/influxdb/defaults/main.yml
index b84436f6cc..a74f00b345 100644
--- a/ansible/roles/influxdb/defaults/main.yml
+++ b/ansible/roles/influxdb/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "influxdb"
-
 influxdb_services:
   influxdb:
     container_name: influxdb
diff --git a/ansible/roles/influxdb/vars/main.yml b/ansible/roles/influxdb/vars/main.yml
new file mode 100644
index 0000000000..9a8a4d1863
--- /dev/null
+++ b/ansible/roles/influxdb/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "influxdb"
diff --git a/ansible/roles/ironic/defaults/main.yml b/ansible/roles/ironic/defaults/main.yml
index 8e6c8ba3e3..1d37bf41ea 100644
--- a/ansible/roles/ironic/defaults/main.yml
+++ b/ansible/roles/ironic/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "ironic"
-
 ironic_services:
   ironic-api:
     container_name: ironic_api
diff --git a/ansible/roles/ironic/vars/main.yml b/ansible/roles/ironic/vars/main.yml
new file mode 100644
index 0000000000..271cb547ee
--- /dev/null
+++ b/ansible/roles/ironic/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "ironic"
diff --git a/ansible/roles/iscsi/defaults/main.yml b/ansible/roles/iscsi/defaults/main.yml
index d44fc2becf..9e15cf8f85 100644
--- a/ansible/roles/iscsi/defaults/main.yml
+++ b/ansible/roles/iscsi/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "iscsi"
-
 iscsi_services:
   iscsid:
     container_name: iscsid
diff --git a/ansible/roles/iscsi/vars/main.yml b/ansible/roles/iscsi/vars/main.yml
new file mode 100644
index 0000000000..41939ede17
--- /dev/null
+++ b/ansible/roles/iscsi/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "iscsi"
diff --git a/ansible/roles/kafka/defaults/main.yml b/ansible/roles/kafka/defaults/main.yml
index fa8483e21a..83c191ce16 100644
--- a/ansible/roles/kafka/defaults/main.yml
+++ b/ansible/roles/kafka/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "kafka"
-
 kafka_services:
   kafka:
     container_name: kafka
diff --git a/ansible/roles/kafka/vars/main.yml b/ansible/roles/kafka/vars/main.yml
new file mode 100644
index 0000000000..be887f0f73
--- /dev/null
+++ b/ansible/roles/kafka/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "kafka"
diff --git a/ansible/roles/karbor/defaults/main.yml b/ansible/roles/karbor/defaults/main.yml
index 85a5d9d7ef..8bdafe0b8e 100644
--- a/ansible/roles/karbor/defaults/main.yml
+++ b/ansible/roles/karbor/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "karbor"
-
 karbor_services:
   karbor-api:
     container_name: karbor_api
diff --git a/ansible/roles/karbor/vars/main.yml b/ansible/roles/karbor/vars/main.yml
new file mode 100644
index 0000000000..f79b46a895
--- /dev/null
+++ b/ansible/roles/karbor/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "karbor"
diff --git a/ansible/roles/keystone/defaults/main.yml b/ansible/roles/keystone/defaults/main.yml
index ad122e09c9..d45a6957e1 100644
--- a/ansible/roles/keystone/defaults/main.yml
+++ b/ansible/roles/keystone/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "keystone"
-
 keystone_services:
   keystone:
     container_name: "keystone"
diff --git a/ansible/roles/keystone/vars/main.yml b/ansible/roles/keystone/vars/main.yml
new file mode 100644
index 0000000000..e85292133a
--- /dev/null
+++ b/ansible/roles/keystone/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "keystone"
diff --git a/ansible/roles/kibana/defaults/main.yml b/ansible/roles/kibana/defaults/main.yml
index 70b201589f..41699b86c8 100644
--- a/ansible/roles/kibana/defaults/main.yml
+++ b/ansible/roles/kibana/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "kibana"
-
 kibana_services:
   kibana:
     container_name: "kibana"
diff --git a/ansible/roles/kibana/vars/main.yml b/ansible/roles/kibana/vars/main.yml
new file mode 100644
index 0000000000..6ba4733485
--- /dev/null
+++ b/ansible/roles/kibana/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "kibana"
diff --git a/ansible/roles/kuryr/defaults/main.yml b/ansible/roles/kuryr/defaults/main.yml
index 8e0156cb19..d3acd77a42 100644
--- a/ansible/roles/kuryr/defaults/main.yml
+++ b/ansible/roles/kuryr/defaults/main.yml
@@ -1,5 +1,4 @@
 ---
-project_name: "kuryr"
 libnetwork_project_name: "kuryr-libnetwork"
 
 # NOTE(huikang, apuimedo): when you request a driver in a docker operation, such
diff --git a/ansible/roles/kuryr/vars/main.yml b/ansible/roles/kuryr/vars/main.yml
new file mode 100644
index 0000000000..dfe30f4a92
--- /dev/null
+++ b/ansible/roles/kuryr/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "kuryr"
diff --git a/ansible/roles/magnum/defaults/main.yml b/ansible/roles/magnum/defaults/main.yml
index 6e465f2253..b7033ac020 100644
--- a/ansible/roles/magnum/defaults/main.yml
+++ b/ansible/roles/magnum/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "magnum"
-
 magnum_services:
   magnum-api:
     container_name: magnum_api
diff --git a/ansible/roles/magnum/vars/main.yml b/ansible/roles/magnum/vars/main.yml
new file mode 100644
index 0000000000..154aa82e9a
--- /dev/null
+++ b/ansible/roles/magnum/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "magnum"
diff --git a/ansible/roles/manila/defaults/main.yml b/ansible/roles/manila/defaults/main.yml
index 2c0727188d..0d9574cabc 100644
--- a/ansible/roles/manila/defaults/main.yml
+++ b/ansible/roles/manila/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "manila"
-
 manila_services:
   manila-api:
     container_name: "manila_api"
diff --git a/ansible/roles/manila/vars/main.yml b/ansible/roles/manila/vars/main.yml
new file mode 100644
index 0000000000..40bf585c93
--- /dev/null
+++ b/ansible/roles/manila/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "manila"
diff --git a/ansible/roles/mariadb/defaults/main.yml b/ansible/roles/mariadb/defaults/main.yml
index a03aadabc5..6294d27266 100644
--- a/ansible/roles/mariadb/defaults/main.yml
+++ b/ansible/roles/mariadb/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "mariadb"
-
 mariadb_services:
   mariadb:
     container_name: mariadb
diff --git a/ansible/roles/mariadb/vars/main.yml b/ansible/roles/mariadb/vars/main.yml
new file mode 100644
index 0000000000..579c707d48
--- /dev/null
+++ b/ansible/roles/mariadb/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "mariadb"
diff --git a/ansible/roles/masakari/defaults/main.yml b/ansible/roles/masakari/defaults/main.yml
index 82638ae488..15f3399f83 100644
--- a/ansible/roles/masakari/defaults/main.yml
+++ b/ansible/roles/masakari/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "masakari"
-
 masakari_services:
   masakari-api:
     container_name: masakari_api
diff --git a/ansible/roles/masakari/vars/main.yml b/ansible/roles/masakari/vars/main.yml
new file mode 100644
index 0000000000..20dfa73082
--- /dev/null
+++ b/ansible/roles/masakari/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "masakari"
diff --git a/ansible/roles/memcached/defaults/main.yml b/ansible/roles/memcached/defaults/main.yml
index 6570bda894..43d7efa028 100644
--- a/ansible/roles/memcached/defaults/main.yml
+++ b/ansible/roles/memcached/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "memcached"
-
 memcached_services:
   memcached:
     container_name: "memcached"
diff --git a/ansible/roles/memcached/vars/main.yml b/ansible/roles/memcached/vars/main.yml
new file mode 100644
index 0000000000..36a162ac31
--- /dev/null
+++ b/ansible/roles/memcached/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "memcached"
diff --git a/ansible/roles/mistral/defaults/main.yml b/ansible/roles/mistral/defaults/main.yml
index 482f50177b..0e09a0e42c 100644
--- a/ansible/roles/mistral/defaults/main.yml
+++ b/ansible/roles/mistral/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "mistral"
-
 mistral_services:
   mistral-api:
     container_name: mistral_api
diff --git a/ansible/roles/mistral/vars/main.yml b/ansible/roles/mistral/vars/main.yml
new file mode 100644
index 0000000000..7a34b31b25
--- /dev/null
+++ b/ansible/roles/mistral/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "mistral"
diff --git a/ansible/roles/monasca/defaults/main.yml b/ansible/roles/monasca/defaults/main.yml
index 17aecdfaea..0bddaf09ec 100644
--- a/ansible/roles/monasca/defaults/main.yml
+++ b/ansible/roles/monasca/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "monasca"
-
 monasca_services:
   monasca-api:
     container_name: monasca_api
diff --git a/ansible/roles/monasca/vars/main.yml b/ansible/roles/monasca/vars/main.yml
new file mode 100644
index 0000000000..73bec68f49
--- /dev/null
+++ b/ansible/roles/monasca/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "monasca"
diff --git a/ansible/roles/mongodb/defaults/main.yml b/ansible/roles/mongodb/defaults/main.yml
index 598e13d448..f5ee0f446e 100644
--- a/ansible/roles/mongodb/defaults/main.yml
+++ b/ansible/roles/mongodb/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "mongodb"
-
 mongodb_services:
   mongodb:
     container_name: mongodb
diff --git a/ansible/roles/mongodb/vars/main.yml b/ansible/roles/mongodb/vars/main.yml
new file mode 100644
index 0000000000..ee0135e4ae
--- /dev/null
+++ b/ansible/roles/mongodb/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "mongodb"
diff --git a/ansible/roles/multipathd/defaults/main.yml b/ansible/roles/multipathd/defaults/main.yml
index 135b40ab91..bd81353f73 100644
--- a/ansible/roles/multipathd/defaults/main.yml
+++ b/ansible/roles/multipathd/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "multipathd"
-
 multipathd_services:
   multipathd:
     container_name: multipathd
diff --git a/ansible/roles/multipathd/vars/main.yml b/ansible/roles/multipathd/vars/main.yml
new file mode 100644
index 0000000000..7df4cc8313
--- /dev/null
+++ b/ansible/roles/multipathd/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "multipathd"
diff --git a/ansible/roles/murano/defaults/main.yml b/ansible/roles/murano/defaults/main.yml
index 6bc2534c0f..0eea4619af 100644
--- a/ansible/roles/murano/defaults/main.yml
+++ b/ansible/roles/murano/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "murano"
-
 murano_services:
   murano-api:
     container_name: murano_api
diff --git a/ansible/roles/murano/vars/main.yml b/ansible/roles/murano/vars/main.yml
new file mode 100644
index 0000000000..b9c934a3d2
--- /dev/null
+++ b/ansible/roles/murano/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "murano"
diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml
index 944fc2f606..30fa3f312a 100644
--- a/ansible/roles/neutron/defaults/main.yml
+++ b/ansible/roles/neutron/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "neutron"
-
 neutron_services:
   neutron-server:
     container_name: "neutron_server"
diff --git a/ansible/roles/neutron/vars/main.yml b/ansible/roles/neutron/vars/main.yml
new file mode 100644
index 0000000000..e11b89fc00
--- /dev/null
+++ b/ansible/roles/neutron/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "neutron"
diff --git a/ansible/roles/nova-cell/defaults/main.yml b/ansible/roles/nova-cell/defaults/main.yml
index 8063aaa7d0..b9c29e6567 100644
--- a/ansible/roles/nova-cell/defaults/main.yml
+++ b/ansible/roles/nova-cell/defaults/main.yml
@@ -1,10 +1,4 @@
 ---
-project_name: "nova"
-
-# NOTE(yoctozepto): we need this for the nova-cell role because this role's
-# vars prefix does not match "{{ project_name }}"
-kolla_role_name: "nova_cell"
-
 nova_cell_services:
   nova-libvirt:
     container_name: nova_libvirt
diff --git a/ansible/roles/nova-cell/vars/main.yml b/ansible/roles/nova-cell/vars/main.yml
new file mode 100644
index 0000000000..03cd0e0879
--- /dev/null
+++ b/ansible/roles/nova-cell/vars/main.yml
@@ -0,0 +1,6 @@
+---
+project_name: "nova"
+
+# NOTE(yoctozepto): we need this for the nova-cell role because this role's
+# vars prefix does not match "{{ project_name }}"
+kolla_role_name: "nova_cell"
diff --git a/ansible/roles/nova-hyperv/defaults/main.yml b/ansible/roles/nova-hyperv/defaults/main.yml
index e927c5d555..bc96ee512e 100644
--- a/ansible/roles/nova-hyperv/defaults/main.yml
+++ b/ansible/roles/nova-hyperv/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "nova-hyperv"
-
 msi_dir: "%SYSTEMDRIVE%\\OpenStack\\MSIs"
 log_dir: "%SYSTEMDRIVE%\\OpenStack\\Log"
 freerdp_msi_url: "https://cloudbase.it/downloads/FreeRDPWebConnect.msi"
diff --git a/ansible/roles/nova-hyperv/vars/main.yml b/ansible/roles/nova-hyperv/vars/main.yml
new file mode 100644
index 0000000000..f9eec4c5ac
--- /dev/null
+++ b/ansible/roles/nova-hyperv/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "nova-hyperv"
diff --git a/ansible/roles/nova/defaults/main.yml b/ansible/roles/nova/defaults/main.yml
index 9560c6aca7..dedf4aedd0 100644
--- a/ansible/roles/nova/defaults/main.yml
+++ b/ansible/roles/nova/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "nova"
-
 nova_services:
   nova-api:
     container_name: "nova_api"
diff --git a/ansible/roles/nova/vars/main.yml b/ansible/roles/nova/vars/main.yml
new file mode 100644
index 0000000000..1cc4931ae4
--- /dev/null
+++ b/ansible/roles/nova/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "nova"
diff --git a/ansible/roles/octavia/defaults/main.yml b/ansible/roles/octavia/defaults/main.yml
index 5e90f500f1..8f3268125a 100644
--- a/ansible/roles/octavia/defaults/main.yml
+++ b/ansible/roles/octavia/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "octavia"
-
 octavia_services:
   octavia-api:
     container_name: octavia_api
diff --git a/ansible/roles/octavia/vars/main.yml b/ansible/roles/octavia/vars/main.yml
new file mode 100644
index 0000000000..712e1e0898
--- /dev/null
+++ b/ansible/roles/octavia/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "octavia"
diff --git a/ansible/roles/openvswitch/defaults/main.yml b/ansible/roles/openvswitch/defaults/main.yml
index 42f1529490..3bf14fdca5 100644
--- a/ansible/roles/openvswitch/defaults/main.yml
+++ b/ansible/roles/openvswitch/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "openvswitch"
-
 openvswitch_services:
   openvswitch-db-server:
     container_name: "openvswitch_db"
diff --git a/ansible/roles/openvswitch/vars/main.yml b/ansible/roles/openvswitch/vars/main.yml
new file mode 100644
index 0000000000..1c779a4c2b
--- /dev/null
+++ b/ansible/roles/openvswitch/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "openvswitch"
diff --git a/ansible/roles/ovn/defaults/main.yml b/ansible/roles/ovn/defaults/main.yml
index 58c26bb6f8..a64d08ce77 100644
--- a/ansible/roles/ovn/defaults/main.yml
+++ b/ansible/roles/ovn/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "ovn"
-
 ovn_services:
   ovn-controller:
     container_name: ovn_controller
diff --git a/ansible/roles/ovn/vars/main.yml b/ansible/roles/ovn/vars/main.yml
new file mode 100644
index 0000000000..c1f916170b
--- /dev/null
+++ b/ansible/roles/ovn/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "ovn"
diff --git a/ansible/roles/ovs-dpdk/defaults/main.yml b/ansible/roles/ovs-dpdk/defaults/main.yml
index 439a5ae5c4..1336ea0c4d 100644
--- a/ansible/roles/ovs-dpdk/defaults/main.yml
+++ b/ansible/roles/ovs-dpdk/defaults/main.yml
@@ -53,7 +53,6 @@ ovs_hugepage_mountpoint: /dev/hugepages
 # valid values are indexed or named.
 ovs_physical_port_policy: named
 
-project_name: "ovs"
 neutron_bridge_name: "br_dpdk"
 
 
diff --git a/ansible/roles/ovs-dpdk/vars/main.yml b/ansible/roles/ovs-dpdk/vars/main.yml
new file mode 100644
index 0000000000..fe77ecdd14
--- /dev/null
+++ b/ansible/roles/ovs-dpdk/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "ovs"
diff --git a/ansible/roles/panko/defaults/main.yml b/ansible/roles/panko/defaults/main.yml
index 6feb213d37..eeda30b461 100644
--- a/ansible/roles/panko/defaults/main.yml
+++ b/ansible/roles/panko/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "panko"
-
 panko_services:
   panko-api:
     container_name: panko_api
diff --git a/ansible/roles/panko/vars/main.yml b/ansible/roles/panko/vars/main.yml
new file mode 100644
index 0000000000..703bbf2219
--- /dev/null
+++ b/ansible/roles/panko/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "panko"
diff --git a/ansible/roles/placement/defaults/main.yml b/ansible/roles/placement/defaults/main.yml
index e4da86bd7d..fea9943309 100644
--- a/ansible/roles/placement/defaults/main.yml
+++ b/ansible/roles/placement/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "placement"
-
 placement_services:
   placement-api:
     container_name: "placement_api"
diff --git a/ansible/roles/placement/vars/main.yml b/ansible/roles/placement/vars/main.yml
new file mode 100644
index 0000000000..59d6ce0bac
--- /dev/null
+++ b/ansible/roles/placement/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "placement"
diff --git a/ansible/roles/prometheus/defaults/main.yml b/ansible/roles/prometheus/defaults/main.yml
index c2cf1cdd66..6ae39918ad 100644
--- a/ansible/roles/prometheus/defaults/main.yml
+++ b/ansible/roles/prometheus/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "prometheus"
-
 prometheus_services:
   prometheus-server:
     container_name: prometheus_server
diff --git a/ansible/roles/prometheus/vars/main.yml b/ansible/roles/prometheus/vars/main.yml
new file mode 100644
index 0000000000..300b4d01bf
--- /dev/null
+++ b/ansible/roles/prometheus/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "prometheus"
diff --git a/ansible/roles/qdrouterd/defaults/main.yml b/ansible/roles/qdrouterd/defaults/main.yml
index c832c810f8..a269e3f975 100644
--- a/ansible/roles/qdrouterd/defaults/main.yml
+++ b/ansible/roles/qdrouterd/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "qdrouterd"
-
 qdrouterd_services:
   qdrouterd:
     container_name: qdrouterd
diff --git a/ansible/roles/qdrouterd/vars/main.yml b/ansible/roles/qdrouterd/vars/main.yml
new file mode 100644
index 0000000000..1d04c1c001
--- /dev/null
+++ b/ansible/roles/qdrouterd/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "qdrouterd"
diff --git a/ansible/roles/qinling/defaults/main.yml b/ansible/roles/qinling/defaults/main.yml
index 7da30735bd..81740fb7c5 100644
--- a/ansible/roles/qinling/defaults/main.yml
+++ b/ansible/roles/qinling/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "qinling"
-
 qinling_services:
   qinling-api:
     container_name: qinling_api
diff --git a/ansible/roles/qinling/vars/main.yml b/ansible/roles/qinling/vars/main.yml
new file mode 100644
index 0000000000..97e7ab90dc
--- /dev/null
+++ b/ansible/roles/qinling/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "qinling"
diff --git a/ansible/roles/rabbitmq/defaults/main.yml b/ansible/roles/rabbitmq/defaults/main.yml
index 875a7d5f4c..b1c0b9a64d 100644
--- a/ansible/roles/rabbitmq/defaults/main.yml
+++ b/ansible/roles/rabbitmq/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "rabbitmq"
-
 rabbitmq_services:
   rabbitmq:
     container_name: "{{ project_name }}"
diff --git a/ansible/roles/rabbitmq/vars/main.yml b/ansible/roles/rabbitmq/vars/main.yml
new file mode 100644
index 0000000000..b6ef021f5e
--- /dev/null
+++ b/ansible/roles/rabbitmq/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "rabbitmq"
diff --git a/ansible/roles/rally/defaults/main.yml b/ansible/roles/rally/defaults/main.yml
index 571abf19be..521da6862a 100644
--- a/ansible/roles/rally/defaults/main.yml
+++ b/ansible/roles/rally/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "rally"
-
 rally_services:
   rally:
     container_name: "rally"
diff --git a/ansible/roles/rally/vars/main.yml b/ansible/roles/rally/vars/main.yml
new file mode 100644
index 0000000000..840075672c
--- /dev/null
+++ b/ansible/roles/rally/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "rally"
diff --git a/ansible/roles/redis/defaults/main.yml b/ansible/roles/redis/defaults/main.yml
index e5eeff444b..67921a777c 100644
--- a/ansible/roles/redis/defaults/main.yml
+++ b/ansible/roles/redis/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "redis"
-
 redis_services:
   redis:
     container_name: redis
diff --git a/ansible/roles/redis/vars/main.yml b/ansible/roles/redis/vars/main.yml
new file mode 100644
index 0000000000..1544bfcf99
--- /dev/null
+++ b/ansible/roles/redis/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "redis"
diff --git a/ansible/roles/sahara/defaults/main.yml b/ansible/roles/sahara/defaults/main.yml
index 97021cde56..b7e01f7800 100644
--- a/ansible/roles/sahara/defaults/main.yml
+++ b/ansible/roles/sahara/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "sahara"
-
 sahara_services:
   sahara-api:
     container_name: sahara_api
diff --git a/ansible/roles/sahara/vars/main.yml b/ansible/roles/sahara/vars/main.yml
new file mode 100644
index 0000000000..8a8430fe65
--- /dev/null
+++ b/ansible/roles/sahara/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "sahara"
diff --git a/ansible/roles/searchlight/defaults/main.yml b/ansible/roles/searchlight/defaults/main.yml
index c7e5f6cbfe..4173f2c405 100644
--- a/ansible/roles/searchlight/defaults/main.yml
+++ b/ansible/roles/searchlight/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "searchlight"
-
 searchlight_services:
   searchlight-api:
     container_name: searchlight_api
diff --git a/ansible/roles/searchlight/vars/main.yml b/ansible/roles/searchlight/vars/main.yml
new file mode 100644
index 0000000000..3ea5499f8e
--- /dev/null
+++ b/ansible/roles/searchlight/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "searchlight"
diff --git a/ansible/roles/senlin/defaults/main.yml b/ansible/roles/senlin/defaults/main.yml
index bfb95a1c60..22759d3899 100644
--- a/ansible/roles/senlin/defaults/main.yml
+++ b/ansible/roles/senlin/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "senlin"
-
 senlin_services:
   senlin-api:
     container_name: senlin_api
diff --git a/ansible/roles/senlin/vars/main.yml b/ansible/roles/senlin/vars/main.yml
new file mode 100644
index 0000000000..03c18bdb3d
--- /dev/null
+++ b/ansible/roles/senlin/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "senlin"
diff --git a/ansible/roles/skydive/defaults/main.yml b/ansible/roles/skydive/defaults/main.yml
index ceff837ded..d5e48446bb 100644
--- a/ansible/roles/skydive/defaults/main.yml
+++ b/ansible/roles/skydive/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "skydive"
-
 skydive_services:
   skydive-analyzer:
     container_name: skydive_analyzer
diff --git a/ansible/roles/skydive/vars/main.yml b/ansible/roles/skydive/vars/main.yml
new file mode 100644
index 0000000000..56c3d1521a
--- /dev/null
+++ b/ansible/roles/skydive/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "skydive"
diff --git a/ansible/roles/solum/defaults/main.yml b/ansible/roles/solum/defaults/main.yml
index e5b878e514..c51717017d 100644
--- a/ansible/roles/solum/defaults/main.yml
+++ b/ansible/roles/solum/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "solum"
-
 solum_services:
   solum-api:
     container_name: solum_api
diff --git a/ansible/roles/solum/vars/main.yml b/ansible/roles/solum/vars/main.yml
new file mode 100644
index 0000000000..40bf810d2e
--- /dev/null
+++ b/ansible/roles/solum/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "solum"
diff --git a/ansible/roles/storm/defaults/main.yml b/ansible/roles/storm/defaults/main.yml
index 25ac5c9dda..4aee3411db 100644
--- a/ansible/roles/storm/defaults/main.yml
+++ b/ansible/roles/storm/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "storm"
-
 storm_services:
   storm-worker:
     container_name: storm_worker
diff --git a/ansible/roles/storm/vars/main.yml b/ansible/roles/storm/vars/main.yml
new file mode 100644
index 0000000000..ccb548beb3
--- /dev/null
+++ b/ansible/roles/storm/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "storm"
diff --git a/ansible/roles/swift/defaults/main.yml b/ansible/roles/swift/defaults/main.yml
index facb31bc72..e2304f409d 100644
--- a/ansible/roles/swift/defaults/main.yml
+++ b/ansible/roles/swift/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "swift"
-
 swift_services:
   swift-proxy-server:
     group: swift-proxy-server
diff --git a/ansible/roles/swift/vars/main.yml b/ansible/roles/swift/vars/main.yml
new file mode 100644
index 0000000000..7fe7983d39
--- /dev/null
+++ b/ansible/roles/swift/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "swift"
diff --git a/ansible/roles/tacker/defaults/main.yml b/ansible/roles/tacker/defaults/main.yml
index 5377f7a384..688d012f3e 100644
--- a/ansible/roles/tacker/defaults/main.yml
+++ b/ansible/roles/tacker/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "tacker"
-
 tacker_services:
   tacker-server:
     container_name: "tacker_server"
diff --git a/ansible/roles/tacker/vars/main.yml b/ansible/roles/tacker/vars/main.yml
new file mode 100644
index 0000000000..8650b6761f
--- /dev/null
+++ b/ansible/roles/tacker/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "tacker"
diff --git a/ansible/roles/telegraf/defaults/main.yml b/ansible/roles/telegraf/defaults/main.yml
index 23caaf1912..3f97183b84 100644
--- a/ansible/roles/telegraf/defaults/main.yml
+++ b/ansible/roles/telegraf/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "telegraf"
-
 telegraf_services:
   telegraf:
     container_name: "telegraf"
diff --git a/ansible/roles/telegraf/vars/main.yml b/ansible/roles/telegraf/vars/main.yml
new file mode 100644
index 0000000000..2253e26c14
--- /dev/null
+++ b/ansible/roles/telegraf/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "telegraf"
diff --git a/ansible/roles/tempest/defaults/main.yml b/ansible/roles/tempest/defaults/main.yml
index d7b1d67a9e..303f30874c 100644
--- a/ansible/roles/tempest/defaults/main.yml
+++ b/ansible/roles/tempest/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "tempest"
-
 tempest_services:
   tempest:
     container_name: "tempest"
diff --git a/ansible/roles/tempest/vars/main.yml b/ansible/roles/tempest/vars/main.yml
new file mode 100644
index 0000000000..7880b6d704
--- /dev/null
+++ b/ansible/roles/tempest/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "tempest"
diff --git a/ansible/roles/trove/defaults/main.yml b/ansible/roles/trove/defaults/main.yml
index ec1ff03192..9faf76a955 100644
--- a/ansible/roles/trove/defaults/main.yml
+++ b/ansible/roles/trove/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "trove"
-
 trove_services:
   trove-api:
     container_name: trove_api
diff --git a/ansible/roles/trove/vars/main.yml b/ansible/roles/trove/vars/main.yml
new file mode 100644
index 0000000000..01849b4ec1
--- /dev/null
+++ b/ansible/roles/trove/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "trove"
diff --git a/ansible/roles/vitrage/defaults/main.yml b/ansible/roles/vitrage/defaults/main.yml
index 1194e73f76..6778b4163f 100644
--- a/ansible/roles/vitrage/defaults/main.yml
+++ b/ansible/roles/vitrage/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "vitrage"
-
 vitrage_services:
   vitrage-api:
     container_name: vitrage_api
diff --git a/ansible/roles/vitrage/vars/main.yml b/ansible/roles/vitrage/vars/main.yml
new file mode 100644
index 0000000000..ee0d018c05
--- /dev/null
+++ b/ansible/roles/vitrage/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "vitrage"
diff --git a/ansible/roles/vmtp/defaults/main.yml b/ansible/roles/vmtp/defaults/main.yml
index 122da92d1d..bf6572fa1a 100644
--- a/ansible/roles/vmtp/defaults/main.yml
+++ b/ansible/roles/vmtp/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "vmtp"
-
 vmtp_services:
   vmtp:
     container_name: "vmtp"
diff --git a/ansible/roles/vmtp/vars/main.yml b/ansible/roles/vmtp/vars/main.yml
new file mode 100644
index 0000000000..b4c53f2948
--- /dev/null
+++ b/ansible/roles/vmtp/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "vmtp"
diff --git a/ansible/roles/watcher/defaults/main.yml b/ansible/roles/watcher/defaults/main.yml
index 42e89e7e47..551f1cfdb6 100644
--- a/ansible/roles/watcher/defaults/main.yml
+++ b/ansible/roles/watcher/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "watcher"
-
 watcher_services:
   watcher-api:
     container_name: watcher_api
diff --git a/ansible/roles/watcher/vars/main.yml b/ansible/roles/watcher/vars/main.yml
new file mode 100644
index 0000000000..e2aa036e30
--- /dev/null
+++ b/ansible/roles/watcher/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "watcher"
diff --git a/ansible/roles/zookeeper/defaults/main.yml b/ansible/roles/zookeeper/defaults/main.yml
index 5ab18e7331..a39eba2bf7 100644
--- a/ansible/roles/zookeeper/defaults/main.yml
+++ b/ansible/roles/zookeeper/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "zookeeper"
-
 zookeeper_services:
   zookeeper:
     container_name: zookeeper
diff --git a/ansible/roles/zookeeper/vars/main.yml b/ansible/roles/zookeeper/vars/main.yml
new file mode 100644
index 0000000000..e0da94acf3
--- /dev/null
+++ b/ansible/roles/zookeeper/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "zookeeper"
diff --git a/ansible/roles/zun/defaults/main.yml b/ansible/roles/zun/defaults/main.yml
index 6fe49c5d8f..cbd4685476 100644
--- a/ansible/roles/zun/defaults/main.yml
+++ b/ansible/roles/zun/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-project_name: "zun"
-
 zun_services:
   zun-api:
     container_name: zun_api
diff --git a/ansible/roles/zun/vars/main.yml b/ansible/roles/zun/vars/main.yml
new file mode 100644
index 0000000000..6be04f59f8
--- /dev/null
+++ b/ansible/roles/zun/vars/main.yml
@@ -0,0 +1,2 @@
+---
+project_name: "zun"