Merge "Move project_name and kolla_role_name to role vars"

ansible/roles/aodh/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "aodh"
-
 aodh_services:
   aodh-api:
     container_name: aodh_api

ansible/roles/aodh/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "aodh"

ansible/roles/barbican/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "barbican"
-
 barbican_services:
   barbican-api:
     container_name: barbican_api

ansible/roles/barbican/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "barbican"

ansible/roles/bifrost/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "bifrost"
-
 ####################
 # Docker
 ####################

ansible/roles/bifrost/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "bifrost"

ansible/roles/blazar/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "blazar"
-
 blazar_services:
   blazar-api:
     container_name: blazar_api

ansible/roles/blazar/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "blazar"

ansible/roles/ceilometer/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "ceilometer"
-
 ceilometer_services:
   ceilometer-notification:
     container_name: ceilometer_notification

ansible/roles/ceilometer/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "ceilometer"

ansible/roles/ceph-rgw/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "ceph-rgw"
-
 ceph_rgw_services:
   # NOTE(mgoddard): There is no container deployment, this is used for load
   # balancer configuration.

ansible/roles/ceph-rgw/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "ceph-rgw"

ansible/roles/cinder/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "cinder"
-
 cinder_services:
   cinder-api:
     container_name: cinder_api

ansible/roles/cinder/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "cinder"

ansible/roles/cloudkitty/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "cloudkitty"
-
 cloudkitty_services:
   cloudkitty-api:
     container_name: "cloudkitty_api"

ansible/roles/cloudkitty/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "cloudkitty"

ansible/roles/collectd/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "collectd"
-
 collectd_services:
   collectd:
     container_name: collectd

ansible/roles/collectd/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "collectd"

ansible/roles/common/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "common"
-
 common_services:
   fluentd:
     container_name: fluentd

ansible/roles/common/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "common"

ansible/roles/cyborg/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "cyborg"
-
 cyborg_services:
   cyborg-api:
     container_name: cyborg_api

ansible/roles/cyborg/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "cyborg"

ansible/roles/designate/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "designate"
-
 designate_services:
   designate-api:
     container_name: designate_api

ansible/roles/designate/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "designate"

ansible/roles/elasticsearch/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "elasticsearch"
-
 elasticsearch_services:
   elasticsearch:
     container_name: elasticsearch

ansible/roles/elasticsearch/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "elasticsearch"

ansible/roles/etcd/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "etcd"
-
 etcd_services:
   etcd:
     container_name: etcd

ansible/roles/etcd/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "etcd"

ansible/roles/freezer/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "freezer"
-
 freezer_services:
   freezer-api:
     container_name: freezer_api

ansible/roles/freezer/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "freezer"

ansible/roles/glance/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "glance"
-
 glance_services:
   glance-api:
     container_name: glance_api

ansible/roles/glance/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "glance"

ansible/roles/gnocchi/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "gnocchi"
-
 gnocchi_services:
   gnocchi-api:
     container_name: gnocchi_api

ansible/roles/gnocchi/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "gnocchi"

ansible/roles/grafana/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "grafana"
-
 grafana_services:
   grafana:
     container_name: grafana

ansible/roles/grafana/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "grafana"

ansible/roles/hacluster/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "hacluster"
-
 hacluster_services:
   hacluster-corosync:
     container_name: "hacluster_corosync"

ansible/roles/hacluster/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "hacluster"

ansible/roles/haproxy-config/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "haproxy-config"
-
 haproxy_service_template: "haproxy_single_service_split.cfg.j2"
 
 # Extra frontend/backend options (additive with locally defined options)

ansible/roles/haproxy-config/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "haproxy-config"

ansible/roles/heat/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "heat"
-
 heat_services:
   heat-api:
     container_name: heat_api

ansible/roles/heat/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "heat"

ansible/roles/horizon/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "horizon"
-
 horizon_services:
   horizon:
     container_name: horizon

ansible/roles/horizon/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "horizon"

ansible/roles/influxdb/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "influxdb"
-
 influxdb_services:
   influxdb:
     container_name: influxdb

ansible/roles/influxdb/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "influxdb"

ansible/roles/ironic/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "ironic"
-
 ironic_services:
   ironic-api:
     container_name: ironic_api

ansible/roles/ironic/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "ironic"

ansible/roles/iscsi/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "iscsi"
-
 iscsi_services:
   iscsid:
     container_name: iscsid

ansible/roles/iscsi/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "iscsi"

ansible/roles/kafka/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "kafka"
-
 kafka_services:
   kafka:
     container_name: kafka

ansible/roles/kafka/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "kafka"

ansible/roles/keystone/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "keystone"
-
 keystone_services:
   keystone:
     container_name: "keystone"

ansible/roles/keystone/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "keystone"

ansible/roles/kibana/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "kibana"
-
 kibana_services:
   kibana:
     container_name: "kibana"

ansible/roles/kibana/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "kibana"

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

ansible/roles/kuryr/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "kuryr"

ansible/roles/loadbalancer/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "loadbalancer"
-
 loadbalancer_services:
   haproxy:
     container_name: haproxy

ansible/roles/loadbalancer/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "loadbalancer"

ansible/roles/magnum/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "magnum"
-
 magnum_services:
   magnum-api:
     container_name: magnum_api

ansible/roles/magnum/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "magnum"

ansible/roles/manila/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "manila"
-
 manila_services:
   manila-api:
     container_name: "manila_api"

ansible/roles/manila/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "manila"

ansible/roles/mariadb/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "mariadb"
-
 mariadb_services:
   mariadb:
     container_name: mariadb

ansible/roles/mariadb/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "mariadb"

ansible/roles/masakari/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "masakari"
-
 masakari_services:
   masakari-api:
     container_name: masakari_api

ansible/roles/masakari/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "masakari"

ansible/roles/memcached/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "memcached"
-
 memcached_services:
   memcached:
     container_name: "memcached"

ansible/roles/memcached/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "memcached"

ansible/roles/mistral/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "mistral"
-
 mistral_services:
   mistral-api:
     container_name: mistral_api

ansible/roles/mistral/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "mistral"

ansible/roles/monasca/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "monasca"
-
 monasca_services:
   monasca-api:
     container_name: monasca_api

ansible/roles/monasca/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "monasca"

ansible/roles/multipathd/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "multipathd"
-
 multipathd_services:
   multipathd:
     container_name: multipathd

ansible/roles/multipathd/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "multipathd"

ansible/roles/murano/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "murano"
-
 murano_services:
   murano-api:
     container_name: murano_api

ansible/roles/murano/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "murano"

ansible/roles/neutron/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "neutron"
-
 neutron_services:
   neutron-server:
     container_name: "neutron_server"

ansible/roles/neutron/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "neutron"

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

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"

ansible/roles/nova/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "nova"
-
 nova_services:
   nova-api:
     container_name: "nova_api"

ansible/roles/nova/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "nova"

ansible/roles/octavia/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "octavia"
-
 octavia_services:
   octavia-api:
     container_name: octavia_api

ansible/roles/octavia/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "octavia"

ansible/roles/openvswitch/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "openvswitch"
-
 openvswitch_services:
   openvswitch-db-server:
     container_name: "openvswitch_db"

ansible/roles/openvswitch/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "openvswitch"

ansible/roles/ovn/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "ovn"
-
 ovn_services:
   ovn-controller:
     container_name: ovn_controller

ansible/roles/ovn/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "ovn"

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"
 
 

ansible/roles/ovs-dpdk/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "ovs"

ansible/roles/placement/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "placement"
-
 placement_services:
   placement-api:
     container_name: "placement_api"

ansible/roles/placement/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "placement"

ansible/roles/prometheus/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "prometheus"
-
 prometheus_services:
   prometheus-server:
     container_name: prometheus_server

ansible/roles/prometheus/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "prometheus"

ansible/roles/qdrouterd/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "qdrouterd"
-
 qdrouterd_services:
   qdrouterd:
     container_name: qdrouterd

ansible/roles/qdrouterd/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "qdrouterd"

ansible/roles/rabbitmq/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "rabbitmq"
-
 rabbitmq_services:
   rabbitmq:
     container_name: "{{ project_name }}"

ansible/roles/rabbitmq/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "rabbitmq"