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 related bug for details).

Change-Id: I3d919736e53d6f3e1a70d1267cf42c8d2c0ad221
Related-Bug: #1951785
This commit is contained in:
Pierre Riteau 2021-11-22 08:26:57 +01:00 committed by Radosław Piliszek
parent 2a7823b5cb
commit 56fc74f231
128 changed files with 132 additions and 130 deletions
ansible/roles
aodh
defaults
vars
barbican
defaults
vars
bifrost
defaults
vars
blazar
defaults
vars
ceilometer
defaults
vars
ceph-rgw
defaults
vars
cinder
defaults
vars
cloudkitty
defaults
vars
collectd
defaults
vars
common
defaults
vars
cyborg
defaults
vars
designate
defaults
vars
elasticsearch
defaults
vars
etcd
defaults
vars
freezer
defaults
vars
glance
defaults
vars
gnocchi
defaults
vars
grafana
defaults
vars
hacluster
defaults
vars
haproxy-config
defaults
vars
heat
defaults
vars
horizon
defaults
vars
influxdb
defaults
vars
ironic
defaults
vars
iscsi
defaults
vars
kafka
defaults
vars
keystone
defaults
vars
kibana
defaults
vars
kuryr
defaults
vars
loadbalancer
defaults
vars
magnum
defaults
vars
manila
defaults
vars
mariadb
defaults
vars
masakari
defaults
vars
memcached
defaults
vars
mistral
defaults
vars
monasca
defaults
vars
multipathd
defaults
vars
murano
defaults
vars
neutron
defaults
vars
nova-cell
defaults
vars
nova
defaults
vars
octavia
defaults
vars
openvswitch
defaults
vars
ovn
defaults
vars
ovs-dpdk
defaults
vars
placement
defaults
vars
prometheus
defaults
vars
qdrouterd
defaults
vars
rabbitmq
defaults
vars

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

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

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

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

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

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

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

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

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

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

@ -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.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -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)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -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

@ -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"

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

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

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

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

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

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

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

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

@ -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"

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

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

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

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

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

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

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

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

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

Some files were not shown because too many files have changed in this diff Show More