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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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