Synchronise Kolla inventory template with upstream

This commit is contained in:
Mark Goddard 2017-03-15 09:44:43 +00:00
parent 23fa4712e3
commit e994882ae4

View File

@ -8,6 +8,7 @@
{% for controller in groups['controllers'] %} {% for controller in groups['controllers'] %}
{% set controller_hv=hostvars[controller] %} {% set controller_hv=hostvars[controller] %}
{{ controller }}{% if "ansible_host" in controller_hv %} ansible_host={{ controller_hv["ansible_host"] }}{% endif %} {{ controller }}{% if "ansible_host" in controller_hv %} ansible_host={{ controller_hv["ansible_host"] }}{% endif %}
{% endfor %} {% endfor %}
[controllers:vars] [controllers:vars]
@ -25,7 +26,6 @@ controllers
controllers controllers
[compute:children] [compute:children]
controllers
[monitoring:children] [monitoring:children]
controllers controllers
@ -33,6 +33,8 @@ controllers
[storage:children] [storage:children]
controllers controllers
[deployment]
[baremetal:children] [baremetal:children]
control control
network network
@ -54,11 +56,18 @@ control
[influxdb:children] [influxdb:children]
monitoring monitoring
[karbor:children]
control
[kibana:children] [kibana:children]
control control
[telegraf:children] [telegraf:children]
compute
control
monitoring monitoring
network
storage
[elasticsearch:children] [elasticsearch:children]
control control
@ -93,6 +102,9 @@ control
[cloudkitty:children] [cloudkitty:children]
control control
[freezer:children]
control
[memcached:children] [memcached:children]
control control
@ -111,6 +123,9 @@ control
[murano:children] [murano:children]
control control
[solum:children]
control
[ironic:children] [ironic:children]
control control
@ -138,9 +153,18 @@ control
[congress:children] [congress:children]
control control
[panko:children]
control
[gnocchi:children] [gnocchi:children]
control control
[tacker:children]
control
[trove:children]
control
# Tempest # Tempest
[tempest:children] [tempest:children]
control control
@ -157,6 +181,21 @@ control
[rally:children] [rally:children]
control control
[searchlight:children]
control
[octavia:children]
control
[designate:children]
control
[placement:children]
control
[bifrost:children]
deployment
# Additional control implemented here. These groups allow you to control which # Additional control implemented here. These groups allow you to control which
# services run on which hosts at a per-service level. # services run on which hosts at a per-service level.
# #
@ -193,6 +232,9 @@ nova
[nova-compute-ironic:children] [nova-compute-ironic:children]
nova nova
[nova-serialproxy:children]
nova
# Neutron # Neutron
[neutron-server:children] [neutron-server:children]
control control
@ -242,6 +284,10 @@ cloudkitty
[cloudkitty-processor:children] [cloudkitty-processor:children]
cloudkitty cloudkitty
# Freezer
[freezer-api:children]
freezer
# iSCSI # iSCSI
[iscsid:children] [iscsid:children]
compute compute
@ -251,6 +297,16 @@ ironic-conductor
[tgtd:children] [tgtd:children]
storage storage
# Karbor
[karbor-api:children]
karbor
[karbor-protection:children]
karbor
[karbor-operationengine:children]
karbor
# Manila # Manila
[manila-api:children] [manila-api:children]
manila manila
@ -261,6 +317,9 @@ manila
[manila-share:children] [manila-share:children]
network network
[manila-data:children]
manila
# Swift # Swift
[swift-proxy-server:children] [swift-proxy-server:children]
swift swift
@ -328,6 +387,19 @@ sahara
[sahara-engine:children] [sahara-engine:children]
sahara sahara
# Solum
[solum-api:children]
solum
[solum-worker:children]
solum
[solum-deployer:children]
solum
[solum-conductor:children]
solum
# Mistral # Mistral
[mistral-api:children] [mistral-api:children]
mistral mistral
@ -377,6 +449,10 @@ congress
[congress-policy-engine:children] [congress-policy-engine:children]
congress congress
# Panko
[panko-api:children]
panko
# Gnocchi # Gnocchi
[gnocchi-api:children] [gnocchi-api:children]
gnocchi gnocchi
@ -387,6 +463,16 @@ gnocchi
[gnocchi-metricd:children] [gnocchi-metricd:children]
gnocchi gnocchi
# Trove
[trove-api:children]
trove
[trove-conductor:children]
trove
[trove-taskmanager:children]
trove
# Multipathd # Multipathd
[multipathd:children] [multipathd:children]
compute compute
@ -407,3 +493,46 @@ senlin
[senlin-engine:children] [senlin-engine:children]
senlin senlin
# Searchlight
[searchlight-api:children]
searchlight
[searchlight-listener:children]
searchlight
# Octavia
[octavia-api:children]
octavia
[octavia-health-manager:children]
octavia
[octavia-housekeeping:children]
octavia
[octavia-worker:children]
octavia
# Designate
[designate-api:children]
designate
[designate-central:children]
designate
[designate-mdns:children]
designate
[designate-worker:children]
designate
[designate-sink:children]
designate
[designate-backend-bind9:children]
designate
# Placement
[placement-api:children]
placement