From 56fc74f23150a9be0c88518ec98bc6a2848ff168 Mon Sep 17 00:00:00 2001 From: Pierre Riteau 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 related bug for details). Change-Id: I3d919736e53d6f3e1a70d1267cf42c8d2c0ad221 Related-Bug: #1951785 --- 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/ceph-rgw/defaults/main.yml | 2 -- ansible/roles/ceph-rgw/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/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/hacluster/defaults/main.yml | 2 -- ansible/roles/hacluster/vars/main.yml | 2 ++ ansible/roles/haproxy-config/defaults/main.yml | 2 -- ansible/roles/haproxy-config/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/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/loadbalancer/defaults/main.yml | 2 -- ansible/roles/loadbalancer/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/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/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/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/rabbitmq/defaults/main.yml | 2 -- ansible/roles/rabbitmq/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/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/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/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 ++ 128 files changed, 132 insertions(+), 130 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/ceph-rgw/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/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/hacluster/vars/main.yml create mode 100644 ansible/roles/haproxy-config/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/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/loadbalancer/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/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/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/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/rabbitmq/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/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/trove/vars/main.yml create mode 100644 ansible/roles/vitrage/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 5ee7de36dc..52e3390512 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 f005194cc9..14da79c9e6 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 7b171d65c2..ac5ea386c7 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 e2279cde6c..c31b3a07e0 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 3a656348d7..3a7fa76e7b 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/ceph-rgw/defaults/main.yml b/ansible/roles/ceph-rgw/defaults/main.yml index 086d09d6c2..dfa53a9106 100644 --- a/ansible/roles/ceph-rgw/defaults/main.yml +++ b/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. diff --git a/ansible/roles/ceph-rgw/vars/main.yml b/ansible/roles/ceph-rgw/vars/main.yml new file mode 100644 index 0000000000..0f95acca25 --- /dev/null +++ b/ansible/roles/ceph-rgw/vars/main.yml @@ -0,0 +1,2 @@ +--- +project_name: "ceph-rgw" diff --git a/ansible/roles/cinder/defaults/main.yml b/ansible/roles/cinder/defaults/main.yml index 40f1992589..2f1857a508 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 6c9d1caaf2..8ac0bad807 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 174ac62bff..f99da8609d 100644 --- a/ansible/roles/common/defaults/main.yml +++ b/ansible/roles/common/defaults/main.yml @@ -1,6 +1,4 @@ --- -project_name: "common" - common_services: fluentd: container_name: fluentd 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/cyborg/defaults/main.yml b/ansible/roles/cyborg/defaults/main.yml index 37abdcd0b6..b712f487bf 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 900f30faab..028c622d06 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 1d4ecd892f..f2cd391df9 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 fd74d91420..60917a9f34 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 82c13ce8c7..b08d907750 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 077c1918f1..c868f1a943 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 692add7091..0773fbe338 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 0fba0e43e2..5fede78add 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/hacluster/defaults/main.yml b/ansible/roles/hacluster/defaults/main.yml index 730d5eb1e4..02d5c2e76c 100644 --- a/ansible/roles/hacluster/defaults/main.yml +++ b/ansible/roles/hacluster/defaults/main.yml @@ -1,6 +1,4 @@ --- -project_name: "hacluster" - hacluster_services: hacluster-corosync: container_name: "hacluster_corosync" diff --git a/ansible/roles/hacluster/vars/main.yml b/ansible/roles/hacluster/vars/main.yml new file mode 100644 index 0000000000..5ea76bf8a0 --- /dev/null +++ b/ansible/roles/hacluster/vars/main.yml @@ -0,0 +1,2 @@ +--- +project_name: "hacluster" diff --git a/ansible/roles/haproxy-config/defaults/main.yml b/ansible/roles/haproxy-config/defaults/main.yml index 595e00adaf..f4eec4bb25 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_split.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/heat/defaults/main.yml b/ansible/roles/heat/defaults/main.yml index 566cb224bb..2fdbd63c4e 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 1cecac3afa..b35104052e 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 a59c9714cc..30f7b03c9b 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 d9c3817cd5..92c8766694 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 a5709279d6..bccc336870 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/keystone/defaults/main.yml b/ansible/roles/keystone/defaults/main.yml index cb4aa206b3..225b26832f 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 48bbad0cc5..2fba8935f3 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 9426a680fa..b5eecaec6c 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/loadbalancer/defaults/main.yml b/ansible/roles/loadbalancer/defaults/main.yml index dd58168d9d..b9935b3adc 100644 --- a/ansible/roles/loadbalancer/defaults/main.yml +++ b/ansible/roles/loadbalancer/defaults/main.yml @@ -1,6 +1,4 @@ --- -project_name: "loadbalancer" - loadbalancer_services: haproxy: container_name: haproxy diff --git a/ansible/roles/loadbalancer/vars/main.yml b/ansible/roles/loadbalancer/vars/main.yml new file mode 100644 index 0000000000..2728ee06d6 --- /dev/null +++ b/ansible/roles/loadbalancer/vars/main.yml @@ -0,0 +1,2 @@ +--- +project_name: "loadbalancer" diff --git a/ansible/roles/magnum/defaults/main.yml b/ansible/roles/magnum/defaults/main.yml index 841b048f6b..ff0fd528a5 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 c246856a61..09461a6585 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 7a9dfd12fa..30eb6d0655 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 099c183f63..3e9b6e6bce 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 238d51fcab..fa38137887 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 db73694414..4f4302d940 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 34eba9eaa2..e47ab7aa0b 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/multipathd/defaults/main.yml b/ansible/roles/multipathd/defaults/main.yml index 5dafe98b48..ba2ee29223 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 e5c19b21e7..27cb899164 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 392a075f36..4535ae0f40 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 e89cd784d7..358808c5b4 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/defaults/main.yml b/ansible/roles/nova/defaults/main.yml index 543babf00c..f2d90a396a 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 3393e1b2a9..2dde6393dd 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 dce692f112..c9dbf23e72 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 e9cea8c66f..9fe09f56d5 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/placement/defaults/main.yml b/ansible/roles/placement/defaults/main.yml index 0af6e5cf32..32df7c4652 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 455684d531..c89b0b7a90 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 4dd2c12591..5121242927 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/rabbitmq/defaults/main.yml b/ansible/roles/rabbitmq/defaults/main.yml index b10c333473..07af33c027 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/redis/defaults/main.yml b/ansible/roles/redis/defaults/main.yml index 9769b495a9..95c5b5bf72 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 fb27d31e72..902a78a50a 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/senlin/defaults/main.yml b/ansible/roles/senlin/defaults/main.yml index 83ed54f3ca..6507ccedc9 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 2d7175132c..4457d81788 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 08d27e7459..56a48e6ed4 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 39660c29ac..daed8f7812 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 12a28d8418..e7cc0c9f4d 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 756b6f6f1c..22a9c288bb 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/trove/defaults/main.yml b/ansible/roles/trove/defaults/main.yml index 8908bbf02f..b46d23fd65 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 3ca0c0e334..672ce4e9ca 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/watcher/defaults/main.yml b/ansible/roles/watcher/defaults/main.yml index de02fe1da8..788298d92f 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 a6b8ad1509..2857cb32ca 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 23656d6080..63c34edc62 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"