Merge "Fix ansible warning"

This commit is contained in:
Zuul 2018-05-11 04:13:44 +00:00 committed by Gerrit Code Review
commit 06b46533a4
178 changed files with 347 additions and 341 deletions

View File

@ -14,7 +14,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -38,7 +38,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -61,7 +61,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -84,7 +84,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool

View File

@ -112,7 +112,7 @@
volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
register: check_aodh_containers
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ aodh_services }}"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -14,7 +14,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -39,7 +39,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -62,7 +62,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool

View File

@ -131,7 +131,7 @@
volumes: "{{ item.value.volumes }}"
register: check_barbican_containers
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ barbican_services }}"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -16,7 +16,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -43,7 +43,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -69,7 +69,7 @@
privileged: "{{ service.privileged | default(False) }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool

View File

@ -171,7 +171,7 @@
volumes: "{{ item.value.volumes }}"
register: check_ceilometer_containers
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ ceilometer_services }}"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -11,6 +11,6 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool

View File

@ -43,7 +43,7 @@
privileged: "{{ item.value.privileged }}"
volumes: "{{ item.value.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ chrony_services }}"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -14,7 +14,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes | reject('equalto', '') | list }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -38,7 +38,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes | reject('equalto', '') | list }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -63,7 +63,7 @@
ipc_mode: "{{ service.ipc_mode | default('') }}"
volumes: "{{ service.volumes | reject('equalto', '') | list }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -87,7 +87,7 @@
privileged: "{{ service.privileged | default(False) }}"
volumes: "{{ service.volumes | reject('equalto', '') | list }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool

View File

@ -130,7 +130,7 @@
ipc_mode: "{{ item.value.ipc_mode | default('') }}"
register: check_cinder_containers
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ cinder_services }}"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -14,7 +14,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -38,7 +38,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool

View File

@ -106,7 +106,7 @@
volumes: "{{ item.value.volumes }}"
register: check_cloudkitty_containers
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ cloudkitty_services }}"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -13,7 +13,7 @@
privileged: "{{ service.privileged | default(False) }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool

View File

@ -69,7 +69,7 @@
volumes: "{{ item.value.volumes }}"
register: check_collectd_containers
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ collectd_services }}"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -13,7 +13,7 @@
volumes: "{{ service.volumes }}"
environment: "{{ service.environment }}"
when:
- action != "config"
- kolla_action != "config"
- service.enabled | bool
- config_json.changed | bool
or fluentd_input.changed | bool
@ -40,7 +40,7 @@
volumes: "{{ service.volumes }}"
environment: "{{ service.environment }}"
when:
- action != "config"
- kolla_action != "config"
- service.enabled | bool
- config_json.changed | bool
or kolla_toolbox_container.changed | bool
@ -65,7 +65,7 @@
volumes: "{{ service.volumes }}"
environment: "{{ service.environment }}"
when:
- action != "config"
- kolla_action != "config"
- service.enabled | bool
- config_json.changed | bool
or cron_confs.changed | bool

View File

@ -256,7 +256,7 @@
environment: "{{ item.value.environment }}"
register: check_common_containers
when:
- action != "config"
- kolla_action != "config"
- item.value.enabled | bool
with_dict: "{{ common_services }}"
notify:

View File

@ -1,5 +1,5 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"
tags: common
when: not common_run

View File

@ -14,7 +14,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -37,7 +37,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -60,7 +60,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool

View File

@ -86,7 +86,7 @@
volumes: "{{ item.value.volumes }}"
register: check_congress_containers
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ congress_services }}"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -12,7 +12,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -36,7 +36,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -59,7 +59,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -82,7 +82,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -105,7 +105,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -128,7 +128,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -153,7 +153,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool

View File

@ -185,7 +185,7 @@
volumes: "{{ item.value.volumes }}"
register: check_designate_containers
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ designate_services }}"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -14,7 +14,7 @@
environment: "{{ service.environment }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool

View File

@ -59,7 +59,7 @@
environment: "{{ item.value.environment }}"
register: check_elasticsearch_containers
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ elasticsearch_services }}"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -13,7 +13,7 @@
environment: "{{ service.environment }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- service.enabled | bool
- service.host_in_groups | bool
- config_json.changed | bool

View File

@ -36,7 +36,7 @@
environment: "{{ item.value.environment }}"
register: check_etcd_containers
when:
- action != "config"
- kolla_action != "config"
- item.value.enabled | bool
- item.value.host_in_groups | bool
with_dict: "{{ etcd_services }}"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -14,7 +14,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool

View File

@ -103,7 +103,7 @@
volumes: "{{ item.value.volumes }}"
register: check_freezer_containers
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ freezer_services }}"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -14,7 +14,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in glance_api_hosts
- service.enabled | bool
- config_json.changed | bool
@ -39,7 +39,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool

View File

@ -120,7 +120,7 @@
volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
register: check_glance_containers
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ glance_services }}"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -14,7 +14,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -38,7 +38,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -61,7 +61,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool

View File

@ -109,7 +109,7 @@
volumes: "{{ item.value.volumes }}"
register: check_gnocchi_containers
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ gnocchi_services }}"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -13,7 +13,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool

View File

@ -109,7 +109,7 @@
volumes: "{{ item.value.volumes }}"
register: check_grafana_containers
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ grafana_services }}"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -13,7 +13,7 @@
privileged: "{{ service.privileged | default(False) }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -37,7 +37,7 @@
privileged: "{{ service.privileged | default(False) }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -51,7 +51,7 @@
register: status
changed_when: status.stdout.find('changed') != -1
when:
- action != "config"
- kolla_action != "config"
- haproxy_config_jsons.changed | bool
or haproxy_cfg.changed | bool
or haproxy_pem.changed | bool

View File

@ -103,7 +103,7 @@
privileged: "{{ item.value.privileged | default(False) }}"
register: check_haproxy_containers
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ haproxy_services }}"

View File

@ -1,3 +1,3 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"
when: inventory_hostname in groups['haproxy']

View File

@ -14,7 +14,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -37,7 +37,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -60,7 +60,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool

View File

@ -103,7 +103,7 @@
volumes: "{{ item.value.volumes }}"
register: check_heat_containers
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ heat_services }}"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -11,7 +11,7 @@
environment: "{{ service.environment }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- horizon_config_json | changed

View File

@ -126,7 +126,7 @@
volumes: "{{ horizon.volumes }}"
register: check_horizon_container
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[horizon.group]
- horizon.enabled | bool
notify:

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -12,7 +12,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool

View File

@ -54,7 +54,7 @@
volumes: "{{ item.value.volumes }}"
register: check_influxdb_containers
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ influxdb_services }}"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -13,7 +13,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -34,7 +34,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -56,7 +56,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool

View File

@ -78,7 +78,7 @@
become: true
register: check_karbor_containers
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ karbor_services }}"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -21,7 +21,7 @@
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
run_once: True
when:
- action == "upgrade"
- kolla_action == "upgrade"
- service.enabled | bool
- inventory_hostname == groups[service.group][0]
@ -40,7 +40,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -64,7 +64,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -86,7 +86,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -114,6 +114,6 @@
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
run_once: True
when:
- action == "upgrade"
- kolla_action == "upgrade"
- service.enabled | bool
- inventory_hostname == groups[service.group][-1]

View File

@ -237,7 +237,7 @@
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
register: check_keystone_containers

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -13,7 +13,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool

View File

@ -49,7 +49,7 @@
volumes: "{{ item.value.volumes }}"
register: check_kibana_containers
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ kibana_services }}"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -16,7 +16,7 @@
cap_add: "{{ service.cap_add }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool

View File

@ -107,7 +107,7 @@
volumes: "{{ item.value.volumes }}"
register: check_kuryr_containers
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ kuryr_services }}"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -15,7 +15,7 @@
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
environment: "{{ service.environment }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -39,7 +39,7 @@
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
environment: "{{ service.environment }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool

View File

@ -92,7 +92,7 @@
environment: "{{ item.value.environment }}"
register: check_magnum_containers
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ magnum_services }}"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -14,7 +14,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -38,7 +38,7 @@
privileged: "{{ service.privileged | default(False) }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -61,7 +61,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -84,7 +84,7 @@
privileged: "{{ service.privileged | default(False) }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool

View File

@ -115,7 +115,7 @@
volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
register: check_manila_containers
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ manila_services }}"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -53,7 +53,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname != master_host
- inventory_hostname in groups[service.group]
- service.enabled | bool
@ -79,7 +79,7 @@
retries: 10
delay: 6
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname != master_host
- name: restart master mariadb
@ -94,7 +94,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname == master_host
- inventory_hostname in groups[service.group]
- service.enabled | bool
@ -120,5 +120,5 @@
retries: 10
delay: 6
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname == master_host

View File

@ -74,7 +74,7 @@
become: true
register: check_mariadb_containers
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ mariadb_services }}"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -9,7 +9,7 @@
name: "{{ service.container_name }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- memcached_config_json.changed | bool

View File

@ -35,5 +35,5 @@
when:
- inventory_hostname in groups[service.group]
- service.enabled | bool
- action != "config"
- kolla_action != "config"
notify: Restart memcached container

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -14,7 +14,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -37,7 +37,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@ -60,7 +60,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool

View File

@ -86,7 +86,7 @@
volumes: "{{ item.value.volumes }}"
register: check_mistral_containers
when:
- action != "config"
- kolla_action != "config"
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ mistral_services }}"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

View File

@ -64,7 +64,7 @@
run_once: True
delegate_to: "{{ groups['murano-api'][0] }}"
when:
- status.stdout.find("io.murano") == -1 or action == "upgrade"
- status.stdout.find("io.murano") == -1 or kolla_action == "upgrade"
- name: Importing Murano applications library package
command: >
@ -78,4 +78,4 @@
run_once: True
delegate_to: "{{ groups['murano-api'][0] }}"
when:
- status.stdout.find("io.murano.applications") == -1 or action == "upgrade"
- status.stdout.find("io.murano.applications") == -1 or kolla_action == "upgrade"

View File

@ -18,7 +18,7 @@
volumes: "{{ service.volumes }}"
privileged: "{{ service.privileged | default(False) }}"
when:
- action != "config"
- kolla_action != "config"
- service.enabled | bool
- service.host_in_groups | bool
- config_json | changed
@ -47,7 +47,7 @@
volumes: "{{ service.volumes }}"
privileged: "{{ service.privileged | default(False) }}"
when:
- action != "config"
- kolla_action != "config"
- service.enabled | bool
- service.host_in_groups | bool
- config_json | changed
@ -73,7 +73,7 @@
volumes: "{{ service.volumes }}"
privileged: "{{ service.privileged | default(False) }}"
when:
- action != "config"
- kolla_action != "config"
- service.enabled | bool
- service.host_in_groups | bool
- config_json | changed
@ -100,7 +100,7 @@
privileged: "{{ service.privileged | default(False) }}"
with_sequence: "start=1 end={{ num_nova_fake_per_node }}"
when:
- action != "config"
- kolla_action != "config"
- enable_nova_fake | bool
- neutron_plugin_agent == "openvswitch"
- inventory_hostname in groups["compute"]
@ -127,7 +127,7 @@
volumes: "{{ service.volumes }}"
privileged: "{{ service.privileged | default(False) }}"
when:
- action != "config"
- kolla_action != "config"
- service.enabled | bool
- service.host_in_groups | bool
- config_json | changed
@ -152,7 +152,7 @@
volumes: "{{ service.volumes }}"
privileged: "{{ service.privileged | default(False) }}"
when:
- action != "config"
- kolla_action != "config"
- service.enabled | bool
- service.host_in_groups | bool
- config_json | changed
@ -182,7 +182,7 @@
volumes: "{{ service.volumes }}"
privileged: "{{ service.privileged | default(False) }}"
when:
- action != "config"
- kolla_action != "config"
- service.enabled | bool
- service.host_in_groups | bool
- config_json | changed
@ -211,7 +211,7 @@
volumes: "{{ service.volumes }}"
privileged: "{{ service.privileged | default(False) }}"
when:
- action != "config"
- kolla_action != "config"
- service.enabled | bool
- service.host_in_groups | bool
- config_json | changed
@ -237,7 +237,7 @@
volumes: "{{ service.volumes }}"
privileged: "{{ service.privileged | default(False) }}"
when:
- action != "config"
- kolla_action != "config"
- service.enabled | bool
- service.host_in_groups | bool
- config_json | changed
@ -262,7 +262,7 @@
volumes: "{{ service.volumes }}"
privileged: "{{ service.privileged | default(False) }}"
when:
- action != "config"
- kolla_action != "config"
- service.enabled | bool
- service.host_in_groups | bool
- config_json | changed
@ -287,7 +287,7 @@
volumes: "{{ service.volumes }}"
privileged: "{{ service.privileged | default(False) }}"
when:
- action != "config"
- kolla_action != "config"
- service.enabled | bool
- service.host_in_groups | bool
- config_json | changed

View File

@ -69,7 +69,7 @@
volumes: "{{ neutron_openvswitch_agent.volumes }}"
register: check_fake_neutron_openvswitch_agent
when:
- action != "config"
- kolla_action != "config"
- enable_nova_fake | bool
- neutron_plugin_agent == "openvswitch"
- inventory_hostname in groups["compute"]

View File

@ -423,7 +423,7 @@
volumes: "{{ item.value.volumes }}"
register: check_neutron_containers
when:
- action != "config"
- kolla_action != "config"
- item.value.enabled | bool
- item.value.host_in_groups | bool
with_dict: "{{ neutron_services }}"

View File

@ -1,2 +1,2 @@
---
- include: "{{ action }}.yml"
- include: "{{ kolla_action }}.yml"

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