diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 0f370feab0..480ccf7b4c 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -554,8 +554,8 @@ supported_policy_format_list: multiple_regions_names: - "{{ openstack_region_name }}" -openstack_service_workers: "{{ [ansible_facts.processor_vcpus, 5]|min }}" -openstack_service_rpc_workers: "{{ [ansible_facts.processor_vcpus, 3]|min }}" +openstack_service_workers: "{{ [ansible_facts.processor_vcpus, 5] | min }}" +openstack_service_rpc_workers: "{{ [ansible_facts.processor_vcpus, 3] | min }}" # Optionally allow Kolla to set sysctl values set_sysctl: "yes" @@ -902,7 +902,7 @@ glance_file_datadir_volume: "glance" glance_enable_rolling_upgrade: "no" glance_enable_property_protection: "no" glance_enable_interoperable_image_import: "no" -glance_api_hosts: "{{ [groups['glance-api']|first] if glance_backend_file | bool and glance_file_datadir_volume == 'glance' else groups['glance-api'] }}" +glance_api_hosts: "{{ [groups['glance-api'] | first] if glance_backend_file | bool and glance_file_datadir_volume == 'glance' else groups['glance-api'] }}" # NOTE(mnasiadka): For use in common role glance_enable_tls_backend: "{{ kolla_enable_tls_backend }}" @@ -938,7 +938,7 @@ cinder_backend_vmware_vstorage_object: "no" cinder_volume_group: "cinder-volumes" cinder_target_helper: "{{ 'lioadm' if ansible_facts.os_family == 'RedHat' else 'tgtadm' }}" # Valid options are [ '', redis, etcd ] -cinder_coordination_backend: "{{ 'redis' if enable_redis|bool else 'etcd' if enable_etcd|bool else '' }}" +cinder_coordination_backend: "{{ 'redis' if enable_redis | bool else 'etcd' if enable_etcd | bool else '' }}" # Valid options are [ nfs, swift, ceph ] cinder_backup_driver: "ceph" @@ -965,7 +965,7 @@ designate_ns_record: designate_backend_external: "no" designate_backend_external_bind9_nameservers: "" # Valid options are [ '', redis ] -designate_coordination_backend: "{{ 'redis' if enable_redis|bool else '' }}" +designate_coordination_backend: "{{ 'redis' if enable_redis | bool else '' }}" designate_internal_endpoint: "{{ internal_protocol }}://{{ designate_internal_fqdn | put_address_in_context('url') }}:{{ designate_api_port }}" designate_public_endpoint: "{{ public_protocol }}://{{ designate_external_fqdn | put_address_in_context('url') }}:{{ designate_api_port }}" @@ -1194,7 +1194,7 @@ ironic_internal_endpoint: "{{ internal_protocol }}://{{ ironic_internal_fqdn | p ironic_public_endpoint: "{{ public_protocol }}://{{ ironic_external_fqdn | put_address_in_context('url') }}:{{ ironic_api_port }}" # Valid options are [ '', redis, etcd ] -ironic_coordination_backend: "{{ 'redis' if enable_redis|bool else 'etcd' if enable_etcd|bool else '' }}" +ironic_coordination_backend: "{{ 'redis' if enable_redis | bool else 'etcd' if enable_etcd | bool else '' }}" ######## # Swift diff --git a/ansible/roles/aodh/handlers/main.yml b/ansible/roles/aodh/handlers/main.yml index f83227db1d..4e7202503a 100644 --- a/ansible/roles/aodh/handlers/main.yml +++ b/ansible/roles/aodh/handlers/main.yml @@ -9,7 +9,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -25,7 +25,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -41,7 +41,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -57,7 +57,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/aodh/tasks/bootstrap_service.yml b/ansible/roles/aodh/tasks/bootstrap_service.yml index 1edd8581fd..b3be49e933 100644 --- a/ansible/roles/aodh/tasks/bootstrap_service.yml +++ b/ansible/roles/aodh/tasks/bootstrap_service.yml @@ -15,6 +15,6 @@ BOOTSTRAP: name: "bootstrap_aodh" restart_policy: no - volumes: "{{ aodh_api.volumes|reject('equalto', '')|list }}" + volumes: "{{ aodh_api.volumes | reject('equalto', '') | list }}" run_once: True delegate_to: "{{ groups[aodh_api.group][0] }}" diff --git a/ansible/roles/aodh/tasks/check-containers.yml b/ansible/roles/aodh/tasks/check-containers.yml index 1133288634..a849226757 100644 --- a/ansible/roles/aodh/tasks/check-containers.yml +++ b/ansible/roles/aodh/tasks/check-containers.yml @@ -6,7 +6,7 @@ common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" image: "{{ item.value.image }}" - volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" + volumes: "{{ item.value.volumes | reject('equalto', '') | list }}" dimensions: "{{ item.value.dimensions }}" healthcheck: "{{ item.value.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/barbican/defaults/main.yml b/ansible/roles/barbican/defaults/main.yml index 13876f8e04..7efcae346c 100644 --- a/ansible/roles/barbican/defaults/main.yml +++ b/ansible/roles/barbican/defaults/main.yml @@ -74,7 +74,7 @@ barbican_api_enable_healthchecks: "{{ enable_container_healthchecks }}" barbican_api_healthcheck_interval: "{{ default_container_healthcheck_interval }}" barbican_api_healthcheck_retries: "{{ default_container_healthcheck_retries }}" barbican_api_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}" -barbican_api_healthcheck_test: ["CMD-SHELL", "healthcheck_curl {{ 'https' if barbican_enable_tls_backend | bool else 'http' }}://{{ api_interface_address | put_address_in_context('url') }}:{{ barbican_api_listen_port}}"] +barbican_api_healthcheck_test: ["CMD-SHELL", "healthcheck_curl {{ 'https' if barbican_enable_tls_backend | bool else 'http' }}://{{ api_interface_address | put_address_in_context('url') }}:{{ barbican_api_listen_port }}"] barbican_api_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}" barbican_api_healthcheck: interval: "{{ barbican_api_healthcheck_interval }}" diff --git a/ansible/roles/barbican/handlers/main.yml b/ansible/roles/barbican/handlers/main.yml index 577f3f7473..256ad1f529 100644 --- a/ansible/roles/barbican/handlers/main.yml +++ b/ansible/roles/barbican/handlers/main.yml @@ -9,7 +9,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -25,7 +25,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -41,7 +41,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/barbican/tasks/bootstrap_service.yml b/ansible/roles/barbican/tasks/bootstrap_service.yml index 9b4618a3c0..3e05024410 100644 --- a/ansible/roles/barbican/tasks/bootstrap_service.yml +++ b/ansible/roles/barbican/tasks/bootstrap_service.yml @@ -15,6 +15,6 @@ BOOTSTRAP: name: "bootstrap_barbican" restart_policy: no - volumes: "{{ barbican_api.volumes|reject('equalto', '')|list }}" + volumes: "{{ barbican_api.volumes | reject('equalto', '') | list }}" run_once: True delegate_to: "{{ groups[barbican_api.group][0] }}" diff --git a/ansible/roles/barbican/tasks/check-containers.yml b/ansible/roles/barbican/tasks/check-containers.yml index 42b241d375..e70d795667 100644 --- a/ansible/roles/barbican/tasks/check-containers.yml +++ b/ansible/roles/barbican/tasks/check-containers.yml @@ -6,7 +6,7 @@ common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" image: "{{ item.value.image }}" - volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" + volumes: "{{ item.value.volumes | reject('equalto', '') | list }}" dimensions: "{{ item.value.dimensions }}" healthcheck: "{{ item.value.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/blazar/handlers/main.yml b/ansible/roles/blazar/handlers/main.yml index b42afd415b..4c08ddaef4 100644 --- a/ansible/roles/blazar/handlers/main.yml +++ b/ansible/roles/blazar/handlers/main.yml @@ -9,7 +9,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -25,7 +25,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/blazar/tasks/bootstrap_service.yml b/ansible/roles/blazar/tasks/bootstrap_service.yml index 71fb97a560..ac90c642f3 100644 --- a/ansible/roles/blazar/tasks/bootstrap_service.yml +++ b/ansible/roles/blazar/tasks/bootstrap_service.yml @@ -15,6 +15,6 @@ BOOTSTRAP: name: "bootstrap_blazar" restart_policy: no - volumes: "{{ blazar_api.volumes|reject('equalto', '')|list }}" + volumes: "{{ blazar_api.volumes | reject('equalto', '') | list }}" run_once: True delegate_to: "{{ groups[blazar_api.group][0] }}" diff --git a/ansible/roles/blazar/tasks/check-containers.yml b/ansible/roles/blazar/tasks/check-containers.yml index 79b0c6cc03..3553a0b3f7 100644 --- a/ansible/roles/blazar/tasks/check-containers.yml +++ b/ansible/roles/blazar/tasks/check-containers.yml @@ -6,7 +6,7 @@ common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" image: "{{ item.value.image }}" - volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" + volumes: "{{ item.value.volumes | reject('equalto', '') | list }}" dimensions: "{{ item.value.dimensions }}" healthcheck: "{{ item.value.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/ceilometer/handlers/main.yml b/ansible/roles/ceilometer/handlers/main.yml index b6d26c05ab..a8cff1655a 100644 --- a/ansible/roles/ceilometer/handlers/main.yml +++ b/ansible/roles/ceilometer/handlers/main.yml @@ -9,7 +9,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -25,7 +25,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -42,7 +42,7 @@ name: "{{ service.container_name }}" image: "{{ service.image }}" privileged: "{{ service.privileged | default(False) }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/ceilometer/tasks/bootstrap_service.yml b/ansible/roles/ceilometer/tasks/bootstrap_service.yml index 37a11ff7b7..c5cb839201 100644 --- a/ansible/roles/ceilometer/tasks/bootstrap_service.yml +++ b/ansible/roles/ceilometer/tasks/bootstrap_service.yml @@ -17,6 +17,6 @@ BOOTSTRAP: name: "bootstrap_ceilometer" restart_policy: no - volumes: "{{ ceilometer_notification.volumes|reject('equalto', '')|list }}" + volumes: "{{ ceilometer_notification.volumes | reject('equalto', '') | list }}" run_once: True delegate_to: "{{ groups[ceilometer_notification.group][0] }}" diff --git a/ansible/roles/ceilometer/tasks/check-containers.yml b/ansible/roles/ceilometer/tasks/check-containers.yml index 752a87a2b1..95829411fe 100644 --- a/ansible/roles/ceilometer/tasks/check-containers.yml +++ b/ansible/roles/ceilometer/tasks/check-containers.yml @@ -7,7 +7,7 @@ name: "{{ item.value.container_name }}" image: "{{ item.value.image }}" privileged: "{{ item.value.privileged | default(False) }}" - volumes: "{{ item.value.volumes | reject('equalto', '')|list }}" + volumes: "{{ item.value.volumes | reject('equalto', '') | list }}" dimensions: "{{ item.value.dimensions }}" healthcheck: "{{ item.value.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/ceilometer/templates/pipeline.yaml.j2 b/ansible/roles/ceilometer/templates/pipeline.yaml.j2 index fd5fad24e6..376559ce3b 100644 --- a/ansible/roles/ceilometer/templates/pipeline.yaml.j2 +++ b/ansible/roles/ceilometer/templates/pipeline.yaml.j2 @@ -12,5 +12,5 @@ sinks: - gnocchi:// {% endif %} {% if enable_ceilometer_prometheus_pushgateway | bool %} - - prometheus://{{ ceilometer_prometheus_pushgateway_host }}:{{ ceilometer_prometheus_pushgateway_port }}/metrics/job/openstack-telemetry{% if ceilometer_prometheus_pushgateway_options %}/?{{ (ceilometer_prometheus_pushgateway_options|dict2items|rejectattr("value", "equalto", None)|list|items2dict).items() | map("join", "=") | join("&")}}{% endif %} + - prometheus://{{ ceilometer_prometheus_pushgateway_host }}:{{ ceilometer_prometheus_pushgateway_port }}/metrics/job/openstack-telemetry{% if ceilometer_prometheus_pushgateway_options %}/?{{ (ceilometer_prometheus_pushgateway_options | dict2items | rejectattr("value", "equalto", None) | list | items2dict).items() | map("join", "=") | join("&")}}{% endif %} {% endif %} diff --git a/ansible/roles/cinder/defaults/main.yml b/ansible/roles/cinder/defaults/main.yml index fa29ffb46c..e40083a57a 100644 --- a/ansible/roles/cinder/defaults/main.yml +++ b/ansible/roles/cinder/defaults/main.yml @@ -89,7 +89,7 @@ cinder_api_enable_healthchecks: "{{ enable_container_healthchecks }}" cinder_api_healthcheck_interval: "{{ default_container_healthcheck_interval }}" cinder_api_healthcheck_retries: "{{ default_container_healthcheck_retries }}" cinder_api_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}" -cinder_api_healthcheck_test: ["CMD-SHELL", "healthcheck_curl {{ 'https' if cinder_enable_tls_backend | bool else 'http' }}://{{ api_interface_address | put_address_in_context('url') }}:{{ cinder_api_listen_port}}"] +cinder_api_healthcheck_test: ["CMD-SHELL", "healthcheck_curl {{ 'https' if cinder_enable_tls_backend | bool else 'http' }}://{{ api_interface_address | put_address_in_context('url') }}:{{ cinder_api_listen_port }}"] cinder_api_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}" cinder_api_healthcheck: interval: "{{ cinder_api_healthcheck_interval }}" @@ -233,7 +233,7 @@ cinder_backends: skip_cinder_backend_check: False -cinder_enabled_backends: "{{ cinder_backends|selectattr('enabled', 'equalto', true)|list }}" +cinder_enabled_backends: "{{ cinder_backends | selectattr('enabled', 'equalto', true) | list }}" #################### # Notification diff --git a/ansible/roles/cinder/tasks/bootstrap_service.yml b/ansible/roles/cinder/tasks/bootstrap_service.yml index e97e579752..3ee985c7f1 100644 --- a/ansible/roles/cinder/tasks/bootstrap_service.yml +++ b/ansible/roles/cinder/tasks/bootstrap_service.yml @@ -15,6 +15,6 @@ BOOTSTRAP: name: "bootstrap_cinder" restart_policy: no - volumes: "{{ cinder_api.volumes|reject('equalto', '')|list }}" + volumes: "{{ cinder_api.volumes | reject('equalto', '') | list }}" run_once: True delegate_to: "{{ groups[cinder_api.group][0] }}" diff --git a/ansible/roles/cloudkitty/defaults/main.yml b/ansible/roles/cloudkitty/defaults/main.yml index 976e592382..2687a34af9 100644 --- a/ansible/roles/cloudkitty/defaults/main.yml +++ b/ansible/roles/cloudkitty/defaults/main.yml @@ -70,7 +70,7 @@ cloudkitty_api_enable_healthchecks: "{{ enable_container_healthchecks }}" cloudkitty_api_healthcheck_interval: "{{ default_container_healthcheck_interval }}" cloudkitty_api_healthcheck_retries: "{{ default_container_healthcheck_retries }}" cloudkitty_api_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}" -cloudkitty_api_healthcheck_test: ["CMD-SHELL", "healthcheck_curl http://{{ api_interface_address | put_address_in_context('url') }}:{{ cloudkitty_api_port}}"] +cloudkitty_api_healthcheck_test: ["CMD-SHELL", "healthcheck_curl http://{{ api_interface_address | put_address_in_context('url') }}:{{ cloudkitty_api_port }}"] cloudkitty_api_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}" cloudkitty_api_healthcheck: interval: "{{ cloudkitty_api_healthcheck_interval }}" diff --git a/ansible/roles/cloudkitty/handlers/main.yml b/ansible/roles/cloudkitty/handlers/main.yml index 686a633dcf..e19a1e9356 100644 --- a/ansible/roles/cloudkitty/handlers/main.yml +++ b/ansible/roles/cloudkitty/handlers/main.yml @@ -9,7 +9,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -25,7 +25,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/cloudkitty/tasks/bootstrap_service.yml b/ansible/roles/cloudkitty/tasks/bootstrap_service.yml index 19ea71d187..ed2e566e2a 100644 --- a/ansible/roles/cloudkitty/tasks/bootstrap_service.yml +++ b/ansible/roles/cloudkitty/tasks/bootstrap_service.yml @@ -15,6 +15,6 @@ BOOTSTRAP: name: "bootstrap_cloudkitty" restart_policy: no - volumes: "{{ cloudkitty_api.volumes|reject('equalto', '')|list }}" + volumes: "{{ cloudkitty_api.volumes | reject('equalto', '') | list }}" run_once: True delegate_to: "{{ groups[cloudkitty_api.group][0] }}" diff --git a/ansible/roles/cloudkitty/tasks/check-containers.yml b/ansible/roles/cloudkitty/tasks/check-containers.yml index c680daf1d9..bc777d4cc9 100644 --- a/ansible/roles/cloudkitty/tasks/check-containers.yml +++ b/ansible/roles/cloudkitty/tasks/check-containers.yml @@ -6,7 +6,7 @@ common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" image: "{{ item.value.image }}" - volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" + volumes: "{{ item.value.volumes | reject('equalto', '') | list }}" dimensions: "{{ item.value.dimensions }}" healthcheck: "{{ item.value.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/designate/handlers/main.yml b/ansible/roles/designate/handlers/main.yml index e151c68e77..c7b7c320b5 100644 --- a/ansible/roles/designate/handlers/main.yml +++ b/ansible/roles/designate/handlers/main.yml @@ -9,7 +9,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -25,7 +25,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -41,7 +41,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -57,7 +57,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -73,7 +73,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -89,7 +89,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -105,7 +105,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/designate/tasks/bootstrap_service.yml b/ansible/roles/designate/tasks/bootstrap_service.yml index 7c82e95477..e3d13510bb 100644 --- a/ansible/roles/designate/tasks/bootstrap_service.yml +++ b/ansible/roles/designate/tasks/bootstrap_service.yml @@ -15,6 +15,6 @@ BOOTSTRAP: name: "bootstrap_designate" restart_policy: no - volumes: "{{ designate_central.volumes|reject('equalto', '')|list }}" + volumes: "{{ designate_central.volumes | reject('equalto', '') | list }}" run_once: True delegate_to: "{{ groups[designate_central.group][0] }}" diff --git a/ansible/roles/designate/tasks/check-containers.yml b/ansible/roles/designate/tasks/check-containers.yml index 4284924941..efe6cac74b 100644 --- a/ansible/roles/designate/tasks/check-containers.yml +++ b/ansible/roles/designate/tasks/check-containers.yml @@ -6,7 +6,7 @@ common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" image: "{{ item.value.image }}" - volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" + volumes: "{{ item.value.volumes | reject('equalto', '') | list }}" dimensions: "{{ item.value.dimensions }}" healthcheck: "{{ item.value.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/elasticsearch/defaults/main.yml b/ansible/roles/elasticsearch/defaults/main.yml index d899f884b3..749e789ac0 100644 --- a/ansible/roles/elasticsearch/defaults/main.yml +++ b/ansible/roles/elasticsearch/defaults/main.yml @@ -62,7 +62,7 @@ elasticsearch_curator_dry_run: false # Index prefix pattern. Any indices matching this regex will # be managed by Curator. -elasticsearch_curator_index_pattern: "^{{ '(monasca|' + kibana_log_prefix + ')' if enable_monasca|bool else kibana_log_prefix }}-.*" +elasticsearch_curator_index_pattern: "^{{ '(monasca|' + kibana_log_prefix + ')' if enable_monasca|bool else kibana_log_prefix }}-.*" # noqa var-spacing # Duration after which an index is staged for deletion. This is # implemented by closing the index. Whilst in this state the index diff --git a/ansible/roles/elasticsearch/tasks/check-containers.yml b/ansible/roles/elasticsearch/tasks/check-containers.yml index 120eadb499..8d4b89ca1b 100644 --- a/ansible/roles/elasticsearch/tasks/check-containers.yml +++ b/ansible/roles/elasticsearch/tasks/check-containers.yml @@ -9,7 +9,7 @@ volumes: "{{ item.value.volumes }}" dimensions: "{{ item.value.dimensions }}" healthcheck: "{{ item.value.healthcheck | default(omit) }}" - environment: "{{ item.value.environment|default(omit) }}" + environment: "{{ item.value.environment | default(omit) }}" when: - inventory_hostname in groups[item.value.group] - item.value.enabled | bool diff --git a/ansible/roles/freezer/handlers/main.yml b/ansible/roles/freezer/handlers/main.yml index 69074b3184..0ca41d0c93 100644 --- a/ansible/roles/freezer/handlers/main.yml +++ b/ansible/roles/freezer/handlers/main.yml @@ -24,7 +24,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes | reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" when: - kolla_action != "config" diff --git a/ansible/roles/glance/defaults/main.yml b/ansible/roles/glance/defaults/main.yml index 694b98ed2b..bfd5a0ea79 100644 --- a/ansible/roles/glance/defaults/main.yml +++ b/ansible/roles/glance/defaults/main.yml @@ -199,7 +199,7 @@ glance_backends: type: swift enabled: "{{ glance_backend_swift | bool }}" -glance_store_backends: "{{ glance_backends|selectattr('enabled', 'equalto', true)|list }}" +glance_store_backends: "{{ glance_backends | selectattr('enabled', 'equalto', true) | list }}" #################### # OpenStack @@ -245,7 +245,7 @@ glance_tls_proxy_http_request_timeout: "10s" glance_tls_proxy_http_keep_alive_timeout: "10s" glance_tls_proxy_queue_timeout: "1m" glance_tls_proxy_connect_timeout: "10s" -glance_tls_proxy_client_timeout: "{{ haproxy_glance_api_client_timeout}}" +glance_tls_proxy_client_timeout: "{{ haproxy_glance_api_client_timeout }}" glance_tls_proxy_server_timeout: "{{ haproxy_glance_api_server_timeout }}" glance_tls_proxy_check_timeout: "10s" diff --git a/ansible/roles/glance/handlers/main.yml b/ansible/roles/glance/handlers/main.yml index a8665539ee..85d5e4e871 100644 --- a/ansible/roles/glance/handlers/main.yml +++ b/ansible/roles/glance/handlers/main.yml @@ -11,7 +11,7 @@ image: "{{ service.image }}" privileged: "{{ service.privileged }}" environment: "{{ service.environment }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -27,7 +27,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/glance/tasks/bootstrap_service.yml b/ansible/roles/glance/tasks/bootstrap_service.yml index bbbf8c00d5..0843153199 100644 --- a/ansible/roles/glance/tasks/bootstrap_service.yml +++ b/ansible/roles/glance/tasks/bootstrap_service.yml @@ -31,7 +31,7 @@ BOOTSTRAP: name: "bootstrap_glance" restart_policy: no - volumes: "{{ glance_api.volumes|reject('equalto', '')|list }}" + volumes: "{{ glance_api.volumes | reject('equalto', '') | list }}" run_once: True delegate_to: "{{ glance_api_hosts[0] }}" diff --git a/ansible/roles/glance/tasks/check-containers.yml b/ansible/roles/glance/tasks/check-containers.yml index ae3dd22415..abea314d84 100644 --- a/ansible/roles/glance/tasks/check-containers.yml +++ b/ansible/roles/glance/tasks/check-containers.yml @@ -8,7 +8,7 @@ image: "{{ item.value.image }}" privileged: "{{ item.value.privileged | default(omit) }}" environment: "{{ item.value.environment | default(omit) }}" - volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" + volumes: "{{ item.value.volumes | reject('equalto', '') | list }}" dimensions: "{{ item.value.dimensions }}" healthcheck: "{{ item.value.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/glance/tasks/precheck.yml b/ansible/roles/glance/tasks/precheck.yml index dc334fbc7d..ceb7a5bd80 100644 --- a/ansible/roles/glance/tasks/precheck.yml +++ b/ansible/roles/glance/tasks/precheck.yml @@ -8,7 +8,7 @@ - name: Get container facts become: true kolla_container_facts: - name: "{{ glance_services.values()|map(attribute='container_name')|list }}" + name: "{{ glance_services.values() | map(attribute='container_name') | list }}" register: container_facts - name: Checking free port for Glance API diff --git a/ansible/roles/glance/tasks/rolling_upgrade.yml b/ansible/roles/glance/tasks/rolling_upgrade.yml index 4fbf1a4656..6f9628b79d 100644 --- a/ansible/roles/glance/tasks/rolling_upgrade.yml +++ b/ansible/roles/glance/tasks/rolling_upgrade.yml @@ -43,7 +43,7 @@ BOOTSTRAP: name: "bootstrap_glance" restart_policy: no - volumes: "{{ glance_api.volumes|reject('equalto', '')|list }}" + volumes: "{{ glance_api.volumes | reject('equalto', '') | list }}" run_once: True delegate_to: "{{ glance_api_hosts[0] }}" @@ -64,7 +64,7 @@ BOOTSTRAP: name: "bootstrap_glance" restart_policy: no - volumes: "{{ glance_api.volumes|reject('equalto', '')|list }}" + volumes: "{{ glance_api.volumes | reject('equalto', '') | list }}" run_once: True delegate_to: "{{ glance_api_hosts[0] }}" notify: @@ -96,7 +96,7 @@ BOOTSTRAP: name: "bootstrap_glance" restart_policy: no - volumes: "{{ glance_api.volumes|reject('equalto', '')|list }}" + volumes: "{{ glance_api.volumes | reject('equalto', '') | list }}" run_once: True delegate_to: "{{ glance_api_hosts[0] }}" diff --git a/ansible/roles/grafana/handlers/main.yml b/ansible/roles/grafana/handlers/main.yml index 30042ef684..0f13e4a187 100644 --- a/ansible/roles/grafana/handlers/main.yml +++ b/ansible/roles/grafana/handlers/main.yml @@ -14,7 +14,7 @@ dimensions: "{{ service.dimensions }}" when: - kolla_action != "config" - - inventory_hostname == groups[service.group]|first + - inventory_hostname == groups[service.group] | first - name: Waiting for grafana to start on first node listen: Restart grafana container @@ -33,7 +33,7 @@ delay: "{{ grafana_start_first_node_delay }}" when: - kolla_action != "config" - - inventory_hostname == groups[service.group]|first + - inventory_hostname == groups[service.group] | first - name: Restart remaining grafana containers listen: Restart grafana container @@ -50,4 +50,4 @@ dimensions: "{{ service.dimensions }}" when: - kolla_action != "config" - - inventory_hostname != groups[service.group]|first + - inventory_hostname != groups[service.group] | first diff --git a/ansible/roles/grafana/tasks/post_config.yml b/ansible/roles/grafana/tasks/post_config.yml index a4ccf1b8df..9a085b10ea 100644 --- a/ansible/roles/grafana/tasks/post_config.yml +++ b/ansible/roles/grafana/tasks/post_config.yml @@ -29,7 +29,7 @@ run_once: True changed_when: response.status == 200 failed_when: response.status not in [200, 409] or - response.status == 409 and ("name already exists" not in response.json.message|default("")) + response.status == 409 and ("name already exists" not in response.json.message | default("")) with_dict: "{{ grafana_data_sources }}" when: item.value.enabled | bool diff --git a/ansible/roles/grafana/tasks/upgrade.yml b/ansible/roles/grafana/tasks/upgrade.yml index e9c7a674c2..ce6e87e99a 100644 --- a/ansible/roles/grafana/tasks/upgrade.yml +++ b/ansible/roles/grafana/tasks/upgrade.yml @@ -26,7 +26,7 @@ common_options: "{{ docker_common_options }}" name: "{{ project_name }}" when: - - inventory_hostname != groups['grafana']|first + - inventory_hostname != groups['grafana'] | first - grafana_differs['result'] - name: Flush handlers diff --git a/ansible/roles/hacluster/handlers/main.yml b/ansible/roles/hacluster/handlers/main.yml index 1bb5fcd3b8..8f9d62a396 100644 --- a/ansible/roles/hacluster/handlers/main.yml +++ b/ansible/roles/hacluster/handlers/main.yml @@ -9,7 +9,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" ipc_mode: "{{ service.ipc_mode }}" cap_add: "{{ service.cap_add }}" dimensions: "{{ service.dimensions }}" @@ -27,7 +27,7 @@ name: "{{ service.container_name }}" image: "{{ service.image }}" environment: "{{ service.environment }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" ipc_mode: "{{ service.ipc_mode }}" dimensions: "{{ service.dimensions }}" when: @@ -43,7 +43,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" ipc_mode: "{{ service.ipc_mode }}" dimensions: "{{ service.dimensions }}" when: diff --git a/ansible/roles/heat/handlers/main.yml b/ansible/roles/heat/handlers/main.yml index a21064e7f3..e5569dc9ba 100644 --- a/ansible/roles/heat/handlers/main.yml +++ b/ansible/roles/heat/handlers/main.yml @@ -9,7 +9,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -25,7 +25,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -41,7 +41,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/heat/tasks/bootstrap_service.yml b/ansible/roles/heat/tasks/bootstrap_service.yml index 4f166b8dc9..4aa7ea9132 100644 --- a/ansible/roles/heat/tasks/bootstrap_service.yml +++ b/ansible/roles/heat/tasks/bootstrap_service.yml @@ -25,6 +25,6 @@ BOOTSTRAP: name: "bootstrap_heat" restart_policy: no - volumes: "{{ heat_api.volumes|reject('equalto', '')|list }}" + volumes: "{{ heat_api.volumes | reject('equalto', '') | list }}" run_once: True delegate_to: "{{ groups[heat_api.group][0] }}" diff --git a/ansible/roles/heat/tasks/check-containers.yml b/ansible/roles/heat/tasks/check-containers.yml index ba598bda50..4ed5471a5c 100644 --- a/ansible/roles/heat/tasks/check-containers.yml +++ b/ansible/roles/heat/tasks/check-containers.yml @@ -6,7 +6,7 @@ common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" image: "{{ item.value.image }}" - volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" + volumes: "{{ item.value.volumes | reject('equalto', '') | list }}" dimensions: "{{ item.value.dimensions }}" healthcheck: "{{ item.value.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/horizon/defaults/main.yml b/ansible/roles/horizon/defaults/main.yml index d88bb6c01b..345334fdb2 100644 --- a/ansible/roles/horizon/defaults/main.yml +++ b/ansible/roles/horizon/defaults/main.yml @@ -37,7 +37,7 @@ horizon_services: enabled: "{{ enable_horizon }}" mode: "http" external: false - port: "{% if kolla_enable_tls_internal|bool %}{{ horizon_tls_port }}{% else %}{{ horizon_port }}{% endif %}" + port: "{% if kolla_enable_tls_internal | bool %}{{ horizon_tls_port }}{% else %}{{ horizon_port }}{% endif %}" listen_port: "{{ horizon_listen_port }}" frontend_http_extra: - "use_backend acme_client_back if { path_reg ^/.well-known/acme-challenge/.+ }" @@ -45,7 +45,7 @@ horizon_services: - "balance source" tls_backend: "{{ horizon_enable_tls_backend }}" horizon_redirect: - enabled: "{{ enable_horizon|bool and kolla_enable_tls_internal|bool }}" + enabled: "{{ enable_horizon | bool and kolla_enable_tls_internal | bool }}" mode: "redirect" external: false port: "{{ horizon_port }}" @@ -54,7 +54,7 @@ horizon_services: enabled: "{{ enable_horizon }}" mode: "http" external: true - port: "{% if kolla_enable_tls_external|bool %}{{ horizon_tls_port }}{% else %}{{ horizon_port }}{% endif %}" + port: "{% if kolla_enable_tls_external | bool %}{{ horizon_tls_port }}{% else %}{{ horizon_port }}{% endif %}" listen_port: "{{ horizon_listen_port }}" frontend_http_extra: - "use_backend acme_client_back if { path_reg ^/.well-known/acme-challenge/.+ }" @@ -62,7 +62,7 @@ horizon_services: - "balance source" tls_backend: "{{ horizon_enable_tls_backend }}" horizon_external_redirect: - enabled: "{{ enable_horizon|bool and kolla_enable_tls_external|bool }}" + enabled: "{{ enable_horizon | bool and kolla_enable_tls_external | bool }}" mode: "redirect" external: true port: "{{ horizon_port }}" diff --git a/ansible/roles/ironic/handlers/main.yml b/ansible/roles/ironic/handlers/main.yml index 542324ff9f..86b97aee4f 100644 --- a/ansible/roles/ironic/handlers/main.yml +++ b/ansible/roles/ironic/handlers/main.yml @@ -10,7 +10,7 @@ name: "{{ service.container_name }}" image: "{{ service.image }}" privileged: "{{ service.privileged | default(False) }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -26,7 +26,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -63,7 +63,7 @@ name: "{{ service.container_name }}" image: "{{ service.image }}" privileged: "{{ service.privileged | default(False) }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/ironic/tasks/bootstrap_service.yml b/ansible/roles/ironic/tasks/bootstrap_service.yml index cfb451cd05..318f418cf9 100644 --- a/ansible/roles/ironic/tasks/bootstrap_service.yml +++ b/ansible/roles/ironic/tasks/bootstrap_service.yml @@ -13,13 +13,13 @@ action: "start_container" common_options: "{{ docker_common_options }}" detach: False - environment: "{{ upgrade_environment if ironic_enable_rolling_upgrade|bool else bootstrap_environment }}" + environment: "{{ upgrade_environment if ironic_enable_rolling_upgrade | bool else bootstrap_environment }}" image: "{{ ironic_api.image }}" labels: BOOTSTRAP: name: "bootstrap_ironic" restart_policy: no - volumes: "{{ ironic_api.volumes|reject('equalto', '')|list }}" + volumes: "{{ ironic_api.volumes | reject('equalto', '') | list }}" run_once: True delegate_to: "{{ groups[ironic_api.group][0] }}" when: inventory_hostname in groups[ironic_api.group] @@ -40,7 +40,7 @@ BOOTSTRAP: name: "bootstrap_ironic_inspector" restart_policy: no - volumes: "{{ ironic_inspector.volumes|reject('equalto', '')|list }}" + volumes: "{{ ironic_inspector.volumes | reject('equalto', '') | list }}" run_once: True delegate_to: "{{ groups[ironic_inspector.group][0] }}" when: inventory_hostname in groups[ironic_inspector.group] diff --git a/ansible/roles/ironic/tasks/check-containers.yml b/ansible/roles/ironic/tasks/check-containers.yml index bf3048d018..b7e5fe123a 100644 --- a/ansible/roles/ironic/tasks/check-containers.yml +++ b/ansible/roles/ironic/tasks/check-containers.yml @@ -6,10 +6,10 @@ common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" image: "{{ item.value.image }}" - privileged: "{{ item.value.privileged|default(False) }}" - cap_add: "{{ item.value.cap_add|default([]) }}" + privileged: "{{ item.value.privileged | default(False) }}" + cap_add: "{{ item.value.cap_add | default([]) }}" environment: "{{ item.value.environment | default(omit) }}" - volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" + volumes: "{{ item.value.volumes | reject('equalto', '') | list }}" dimensions: "{{ item.value.dimensions }}" healthcheck: "{{ item.value.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/iscsi/handlers/main.yml b/ansible/roles/iscsi/handlers/main.yml index 17438f8200..5efd8cc82e 100644 --- a/ansible/roles/iscsi/handlers/main.yml +++ b/ansible/roles/iscsi/handlers/main.yml @@ -11,7 +11,7 @@ image: "{{ service.image }}" ipc_mode: "{{ service.ipc_mode }}" privileged: "{{ service.privileged }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" when: - kolla_action != "config" @@ -28,7 +28,7 @@ image: "{{ service.image }}" ipc_mode: "{{ service.ipc_mode }}" privileged: "{{ service.privileged }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" when: - kolla_action != "config" diff --git a/ansible/roles/iscsi/tasks/check-containers.yml b/ansible/roles/iscsi/tasks/check-containers.yml index 6747d56047..ed85f5062f 100644 --- a/ansible/roles/iscsi/tasks/check-containers.yml +++ b/ansible/roles/iscsi/tasks/check-containers.yml @@ -7,7 +7,7 @@ name: "{{ item.value.container_name }}" image: "{{ item.value.image }}" ipc_mode: "{{ item.value.ipc_mode }}" - privileged: "{{ item.value.privileged|default(False) }}" + privileged: "{{ item.value.privileged | default(False) }}" volumes: "{{ item.value.volumes }}" dimensions: "{{ item.value.dimensions }}" when: diff --git a/ansible/roles/keystone/handlers/main.yml b/ansible/roles/keystone/handlers/main.yml index 8acb7e51f0..a941a3e4de 100644 --- a/ansible/roles/keystone/handlers/main.yml +++ b/ansible/roles/keystone/handlers/main.yml @@ -19,7 +19,7 @@ KOLLA_UPGRADE: name: "init_upgrade_database" restart_policy: no - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" run_once: True when: @@ -36,7 +36,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -52,7 +52,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -68,7 +68,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -91,7 +91,7 @@ KOLLA_UPGRADE: name: "finish_upgrade_database" restart_policy: no - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" run_once: True when: diff --git a/ansible/roles/keystone/tasks/bootstrap_service.yml b/ansible/roles/keystone/tasks/bootstrap_service.yml index 58ae7bd000..be77d44669 100644 --- a/ansible/roles/keystone/tasks/bootstrap_service.yml +++ b/ansible/roles/keystone/tasks/bootstrap_service.yml @@ -45,7 +45,7 @@ BOOTSTRAP: name: "bootstrap_keystone" restart_policy: no - volumes: "{{ keystone.volumes|reject('equalto', '')|list }}" + volumes: "{{ keystone.volumes | reject('equalto', '') | list }}" run_once: True - name: Running Keystone fernet bootstrap container @@ -67,7 +67,7 @@ fernet_setup --keystone-user {{ keystone_username }} --keystone-group {{ keystone_groupname }}' name: "bootstrap_keystone_fernet" restart_policy: no - volumes: "{{ keystone_fernet.volumes|reject('equalto', '')|list }}" + volumes: "{{ keystone_fernet.volumes | reject('equalto', '') | list }}" run_once: True delegate_to: "{{ groups['keystone'][0] }}" when: diff --git a/ansible/roles/keystone/tasks/check-containers.yml b/ansible/roles/keystone/tasks/check-containers.yml index 437495e570..03f4ffffb7 100644 --- a/ansible/roles/keystone/tasks/check-containers.yml +++ b/ansible/roles/keystone/tasks/check-containers.yml @@ -6,7 +6,7 @@ common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" image: "{{ item.value.image }}" - volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" + volumes: "{{ item.value.volumes | reject('equalto', '') | list }}" dimensions: "{{ item.value.dimensions }}" healthcheck: "{{ item.value.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/keystone/tasks/config.yml b/ansible/roles/keystone/tasks/config.yml index 804d3d27ae..53c1d9cfc3 100644 --- a/ansible/roles/keystone/tasks/config.yml +++ b/ansible/roles/keystone/tasks/config.yml @@ -125,7 +125,7 @@ - inventory_hostname in groups[keystone.group] - keystone.enabled | bool - keystone_domain_directory.stat.exists - with_items: "{{ keystone_domains.files|default([]) }}" + with_items: "{{ keystone_domains.files | default([]) }}" notify: - Restart keystone container diff --git a/ansible/roles/kuryr/tasks/check-containers.yml b/ansible/roles/kuryr/tasks/check-containers.yml index e89eec8787..7a7d5a7e95 100644 --- a/ansible/roles/kuryr/tasks/check-containers.yml +++ b/ansible/roles/kuryr/tasks/check-containers.yml @@ -6,7 +6,7 @@ common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" image: "{{ item.value.image }}" - privileged: "{{ item.value.privileged|default(False) }}" + privileged: "{{ item.value.privileged | default(False) }}" cap_add: "{{ item.value.cap_add }}" volumes: "{{ item.value.volumes }}" dimensions: "{{ item.value.dimensions }}" diff --git a/ansible/roles/loadbalancer/tasks/precheck.yml b/ansible/roles/loadbalancer/tasks/precheck.yml index b81dcf28e2..c62f85816e 100644 --- a/ansible/roles/loadbalancer/tasks/precheck.yml +++ b/ansible/roles/loadbalancer/tasks/precheck.yml @@ -98,9 +98,9 @@ failed_when: ping_output.rc != 1 with_items: - address: "{{ kolla_internal_vip_address }}" - command: "{{ 'ping' if kolla_internal_vip_address|ipv4 else 'ping6' }}" + command: "{{ 'ping' if kolla_internal_vip_address | ipv4 else 'ping6' }}" - address: "{{ kolla_external_vip_address }}" - command: "{{ 'ping' if kolla_external_vip_address|ipv4 else 'ping6' }}" + command: "{{ 'ping' if kolla_external_vip_address | ipv4 else 'ping6' }}" when: - enable_keepalived | bool - keepalived_vip_prechecks @@ -167,7 +167,7 @@ - name: Setting haproxy stat fact set_fact: - haproxy_stat: "{{ haproxy_stat_shell.stdout|default('') }}" + haproxy_stat: "{{ haproxy_stat_shell.stdout | default('') }}" - name: Checking free port for Aodh API HAProxy wait_for: diff --git a/ansible/roles/magnum/handlers/main.yml b/ansible/roles/magnum/handlers/main.yml index 4bb021191e..049877a584 100644 --- a/ansible/roles/magnum/handlers/main.yml +++ b/ansible/roles/magnum/handlers/main.yml @@ -9,7 +9,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" environment: "{{ service.environment }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" @@ -26,7 +26,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" environment: "{{ service.environment }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" diff --git a/ansible/roles/magnum/tasks/bootstrap_service.yml b/ansible/roles/magnum/tasks/bootstrap_service.yml index 40e3272301..fe79cbeef2 100644 --- a/ansible/roles/magnum/tasks/bootstrap_service.yml +++ b/ansible/roles/magnum/tasks/bootstrap_service.yml @@ -15,6 +15,6 @@ BOOTSTRAP: name: "bootstrap_magnum" restart_policy: no - volumes: "{{ magnum_api.volumes|reject('equalto', '')|list }}" + volumes: "{{ magnum_api.volumes | reject('equalto', '') | list }}" run_once: True delegate_to: "{{ groups[magnum_api.group][0] }}" diff --git a/ansible/roles/magnum/tasks/check-containers.yml b/ansible/roles/magnum/tasks/check-containers.yml index 3264f01a57..96882bd034 100644 --- a/ansible/roles/magnum/tasks/check-containers.yml +++ b/ansible/roles/magnum/tasks/check-containers.yml @@ -6,7 +6,7 @@ common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" image: "{{ item.value.image }}" - volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" + volumes: "{{ item.value.volumes | reject('equalto', '') | list }}" dimensions: "{{ item.value.dimensions }}" healthcheck: "{{ item.value.healthcheck | default(omit) }}" environment: "{{ item.value.environment }}" diff --git a/ansible/roles/manila/defaults/main.yml b/ansible/roles/manila/defaults/main.yml index 19f815d6bb..7a0c12f89d 100644 --- a/ansible/roles/manila/defaults/main.yml +++ b/ansible/roles/manila/defaults/main.yml @@ -222,7 +222,7 @@ manila_backends: protocols: - "NFS" -manila_enabled_backends: "{{ manila_backends|selectattr('enabled', 'equalto', true)|list }}" +manila_enabled_backends: "{{ manila_backends | selectattr('enabled', 'equalto', true) | list }}" #################### diff --git a/ansible/roles/manila/handlers/main.yml b/ansible/roles/manila/handlers/main.yml index baea2998c6..d7ef447b1a 100644 --- a/ansible/roles/manila/handlers/main.yml +++ b/ansible/roles/manila/handlers/main.yml @@ -9,7 +9,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -26,7 +26,7 @@ name: "{{ service.container_name }}" image: "{{ service.image }}" privileged: "{{ service.privileged | default(False) }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -42,7 +42,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -60,7 +60,7 @@ image: "{{ service.image }}" privileged: "{{ service.privileged | default(False) }}" ipc_mode: "host" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/manila/tasks/bootstrap_service.yml b/ansible/roles/manila/tasks/bootstrap_service.yml index 0371bf06ab..13786be068 100644 --- a/ansible/roles/manila/tasks/bootstrap_service.yml +++ b/ansible/roles/manila/tasks/bootstrap_service.yml @@ -15,6 +15,6 @@ BOOTSTRAP: name: "bootstrap_manila" restart_policy: no - volumes: "{{ manila_api.volumes|reject('equalto', '')|list }}" + volumes: "{{ manila_api.volumes | reject('equalto', '') | list }}" run_once: True delegate_to: "{{ groups[manila_api.group][0] }}" diff --git a/ansible/roles/manila/tasks/check-containers.yml b/ansible/roles/manila/tasks/check-containers.yml index 4699e0afa7..18fc052f8a 100644 --- a/ansible/roles/manila/tasks/check-containers.yml +++ b/ansible/roles/manila/tasks/check-containers.yml @@ -6,8 +6,8 @@ common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" image: "{{ item.value.image }}" - privileged: "{{ item.value.privileged|default(False) }}" - volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" + privileged: "{{ item.value.privileged | default(False) }}" + volumes: "{{ item.value.volumes | reject('equalto', '') | list }}" dimensions: "{{ item.value.dimensions }}" healthcheck: "{{ item.value.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/mariadb/defaults/main.yml b/ansible/roles/mariadb/defaults/main.yml index e43c79ab39..c0c446e685 100644 --- a/ansible/roles/mariadb/defaults/main.yml +++ b/ansible/roles/mariadb/defaults/main.yml @@ -9,7 +9,7 @@ mariadb_services: dimensions: "{{ mariadb_dimensions }}" haproxy: mariadb: - enabled: "{{ enable_mariadb|bool and not enable_external_mariadb_load_balancer|bool }}" + enabled: "{{ enable_mariadb | bool and not enable_external_mariadb_load_balancer | bool }}" mode: "tcp" port: "{{ database_port }}" listen_port: "{{ mariadb_port }}" @@ -22,7 +22,7 @@ mariadb_services: - "{% if enable_mariadb_clustercheck | bool %}option httpchk{% endif %}" custom_member_list: "{{ internal_haproxy_members.split(';') }}" mariadb_external_lb: - enabled: "{{ enable_external_mariadb_load_balancer|bool }}" + enabled: "{{ enable_external_mariadb_load_balancer | bool }}" mode: "tcp" port: "{{ database_port }}" listen_port: "{{ mariadb_port }}" diff --git a/ansible/roles/masakari/handlers/main.yml b/ansible/roles/masakari/handlers/main.yml index c2108b7587..b78bc4b933 100644 --- a/ansible/roles/masakari/handlers/main.yml +++ b/ansible/roles/masakari/handlers/main.yml @@ -10,7 +10,7 @@ name: "{{ service.container_name }}" image: "{{ service.image }}" privileged: "{{ service.privileged | default(False) }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" when: - kolla_action != "config" @@ -26,7 +26,7 @@ name: "{{ service.container_name }}" image: "{{ service.image }}" privileged: "{{ service.privileged | default(False) }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" when: - kolla_action != "config" @@ -42,7 +42,7 @@ name: "{{ service.container_name }}" image: "{{ service.image }}" privileged: "{{ service.privileged | default(True) }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" when: - kolla_action != "config" @@ -58,7 +58,7 @@ name: "{{ service.container_name }}" image: "{{ service.image }}" ipc_mode: "{{ service.ipc_mode }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" when: - kolla_action != "config" diff --git a/ansible/roles/masakari/tasks/bootstrap_service.yml b/ansible/roles/masakari/tasks/bootstrap_service.yml index 465032d3e8..c5782dc184 100644 --- a/ansible/roles/masakari/tasks/bootstrap_service.yml +++ b/ansible/roles/masakari/tasks/bootstrap_service.yml @@ -15,6 +15,6 @@ BOOTSTRAP: name: "bootstrap_masakari" restart_policy: "no" - volumes: "{{ masakari_api.volumes|reject('equalto', '')|list }}" + volumes: "{{ masakari_api.volumes | reject('equalto', '') | list }}" run_once: True delegate_to: "{{ groups[masakari_api.group][0] }}" diff --git a/ansible/roles/memcached/defaults/main.yml b/ansible/roles/memcached/defaults/main.yml index 2589d2ccff..8cd0595ae8 100644 --- a/ansible/roles/memcached/defaults/main.yml +++ b/ansible/roles/memcached/defaults/main.yml @@ -10,7 +10,7 @@ memcached_services: healthcheck: "{{ memcached_healthcheck }}" haproxy: memcached: - enabled: "{{ enable_memcached|bool and enable_haproxy_memcached|bool }}" + enabled: "{{ enable_memcached | bool and enable_haproxy_memcached | bool }}" mode: "tcp" port: "{{ memcached_port }}" frontend_tcp_extra: diff --git a/ansible/roles/mistral/handlers/main.yml b/ansible/roles/mistral/handlers/main.yml index 2163a7e77b..60a3852c5d 100644 --- a/ansible/roles/mistral/handlers/main.yml +++ b/ansible/roles/mistral/handlers/main.yml @@ -9,7 +9,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -25,7 +25,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -41,7 +41,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" healthcheck: "{{ service.healthcheck | default(omit) }}" dimensions: "{{ service.dimensions }}" when: @@ -57,7 +57,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/mistral/tasks/bootstrap_service.yml b/ansible/roles/mistral/tasks/bootstrap_service.yml index dc001d1dc1..f37ae7fca0 100644 --- a/ansible/roles/mistral/tasks/bootstrap_service.yml +++ b/ansible/roles/mistral/tasks/bootstrap_service.yml @@ -15,6 +15,6 @@ BOOTSTRAP: name: "bootstrap_mistral" restart_policy: no - volumes: "{{ mistral_api.volumes|reject('equalto', '')|list }}" + volumes: "{{ mistral_api.volumes | reject('equalto', '') | list }}" run_once: True delegate_to: "{{ groups[mistral_api.group][0] }}" diff --git a/ansible/roles/mistral/tasks/check-containers.yml b/ansible/roles/mistral/tasks/check-containers.yml index ae9c71e511..adf9eb8cd2 100644 --- a/ansible/roles/mistral/tasks/check-containers.yml +++ b/ansible/roles/mistral/tasks/check-containers.yml @@ -6,7 +6,7 @@ common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" image: "{{ item.value.image }}" - volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" + volumes: "{{ item.value.volumes | reject('equalto', '') | list }}" dimensions: "{{ item.value.dimensions }}" healthcheck: "{{ item.value.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/monasca/defaults/main.yml b/ansible/roles/monasca/defaults/main.yml index 7902044f6b..9ef43a5a0e 100644 --- a/ansible/roles/monasca/defaults/main.yml +++ b/ansible/roles/monasca/defaults/main.yml @@ -120,7 +120,7 @@ monasca_default_topic_partitions: 30 # The default number of topic replicas. Generally you should not change # this. -monasca_default_topic_replication_factor: "{{ kafka_broker_count if kafka_broker_count|int < 3 else 3 }}" +monasca_default_topic_replication_factor: "{{ kafka_broker_count if kafka_broker_count | int < 3 else 3 }}" # Kafka topic names used by Monasca services monasca_metrics_topic: "metrics" diff --git a/ansible/roles/monasca/handlers/main.yml b/ansible/roles/monasca/handlers/main.yml index 1fcef1cf9a..41d67af5a5 100644 --- a/ansible/roles/monasca/handlers/main.yml +++ b/ansible/roles/monasca/handlers/main.yml @@ -46,7 +46,7 @@ environment: KOLLA_BOOTSTRAP: run_once: True - delegate_to: "{{ groups[service.group]|first }}" + delegate_to: "{{ groups[service.group] | first }}" when: - kolla_action != "config" @@ -67,7 +67,7 @@ KOLLA_BOOTSTRAP: TOPOLOGY_REPLACE: run_once: True - delegate_to: "{{ groups[service.group]|first }}" + delegate_to: "{{ groups[service.group] | first }}" when: - kolla_action != "config" diff --git a/ansible/roles/monasca/tasks/check-containers.yml b/ansible/roles/monasca/tasks/check-containers.yml index 5bd0ee8ee9..74a3a6af43 100644 --- a/ansible/roles/monasca/tasks/check-containers.yml +++ b/ansible/roles/monasca/tasks/check-containers.yml @@ -6,7 +6,7 @@ common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" image: "{{ item.value.image }}" - pid_mode: "{{ item.value.pid_mode|default('') }}" + pid_mode: "{{ item.value.pid_mode | default('') }}" volumes: "{{ item.value.volumes }}" dimensions: "{{ item.value.dimensions }}" state: "{{ item.value.state | default('running') }}" diff --git a/ansible/roles/monasca/tasks/precheck.yml b/ansible/roles/monasca/tasks/precheck.yml index 51196b9967..1e3cc9cd59 100644 --- a/ansible/roles/monasca/tasks/precheck.yml +++ b/ansible/roles/monasca/tasks/precheck.yml @@ -8,7 +8,7 @@ - name: Get container facts become: true kolla_container_facts: - name: "{{ monasca_services.values()|map(attribute='container_name')|list }}" + name: "{{ monasca_services.values() | map(attribute='container_name') | list }}" register: container_facts - name: Checking free port for monasca-api diff --git a/ansible/roles/monasca/tasks/upgrade.yml b/ansible/roles/monasca/tasks/upgrade.yml index ba4639c7e6..9db8c9dddb 100644 --- a/ansible/roles/monasca/tasks/upgrade.yml +++ b/ansible/roles/monasca/tasks/upgrade.yml @@ -21,7 +21,7 @@ name: "{{ monasca_services['monasca-thresh']['container_name'] }}" when: - inventory_hostname in groups['monasca-thresh'] - - inventory_hostname != groups['monasca-thresh']|first + - inventory_hostname != groups['monasca-thresh'] | first - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/multipathd/handlers/main.yml b/ansible/roles/multipathd/handlers/main.yml index b3304fe843..91983d4486 100644 --- a/ansible/roles/multipathd/handlers/main.yml +++ b/ansible/roles/multipathd/handlers/main.yml @@ -11,6 +11,6 @@ image: "{{ service.image }}" ipc_mode: "{{ service.ipc_mode }}" privileged: "{{ service.privileged }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" when: - kolla_action != "config" diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml index 832b577197..835c2f3333 100644 --- a/ansible/roles/neutron/defaults/main.yml +++ b/ansible/roles/neutron/defaults/main.yml @@ -11,13 +11,13 @@ neutron_services: healthcheck: "{{ neutron_server_healthcheck }}" haproxy: neutron_server: - enabled: "{{ enable_neutron | bool and not neutron_enable_tls_backend | bool}}" + enabled: "{{ enable_neutron | bool and not neutron_enable_tls_backend | bool }}" mode: "http" external: false port: "{{ neutron_server_port }}" listen_port: "{{ neutron_server_listen_port }}" neutron_server_external: - enabled: "{{ enable_neutron | bool and not neutron_enable_tls_backend | bool}}" + enabled: "{{ enable_neutron | bool and not neutron_enable_tls_backend | bool }}" mode: "http" external: true port: "{{ neutron_server_port }}" diff --git a/ansible/roles/neutron/handlers/main.yml b/ansible/roles/neutron/handlers/main.yml index 243c9b5a0e..20981506a2 100644 --- a/ansible/roles/neutron/handlers/main.yml +++ b/ansible/roles/neutron/handlers/main.yml @@ -9,7 +9,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" privileged: "{{ service.privileged | default(False) }}" healthcheck: "{{ service.healthcheck | default(omit) }}" @@ -27,7 +27,7 @@ name: "{{ service.container_name }}" image: "{{ service.image }}" environment: "{{ service.environment }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" privileged: "{{ service.privileged | default(False) }}" healthcheck: "{{ service.healthcheck | default(omit) }}" @@ -44,7 +44,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" privileged: "{{ service.privileged | default(False) }}" healthcheck: "{{ service.healthcheck | default(omit) }}" @@ -63,7 +63,7 @@ name: "{{ service.container_name }}" image: "{{ service.image }}" environment: "{{ service.environment }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" privileged: "{{ service.privileged | default(False) }}" healthcheck: "{{ service.healthcheck | default(omit) }}" @@ -80,7 +80,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" privileged: "{{ service.privileged | default(False) }}" healthcheck: "{{ service.healthcheck | default(omit) }}" @@ -98,7 +98,7 @@ name: "{{ service.container_name }}" image: "{{ service.image }}" environment: "{{ service.environment }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" privileged: "{{ service.privileged | default(False) }}" healthcheck: "{{ service.healthcheck | default(omit) }}" @@ -115,7 +115,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" privileged: "{{ service.privileged | default(False) }}" healthcheck: "{{ service.healthcheck | default(omit) }}" @@ -132,7 +132,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" privileged: "{{ service.privileged | default(False) }}" when: @@ -148,7 +148,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" privileged: "{{ service.privileged | default(False) }}" when: @@ -164,7 +164,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -180,7 +180,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" privileged: "{{ service.privileged | default(False) }}" healthcheck: "{{ service.healthcheck | default(omit) }}" @@ -197,7 +197,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" privileged: "{{ service.privileged | default(False) }}" healthcheck: "{{ service.healthcheck | default(omit) }}" @@ -248,7 +248,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" privileged: "{{ service.privileged | default(False) }}" healthcheck: "{{ service.healthcheck | default(omit) }}" diff --git a/ansible/roles/neutron/tasks/rolling_upgrade.yml b/ansible/roles/neutron/tasks/rolling_upgrade.yml index 8828497c34..ce6e2e372b 100644 --- a/ansible/roles/neutron/tasks/rolling_upgrade.yml +++ b/ansible/roles/neutron/tasks/rolling_upgrade.yml @@ -57,7 +57,7 @@ name: "{{ neutron_server.container_name }}" when: - neutron_server.host_in_groups | bool - - is_stop_neutron_server|length > 0 + - is_stop_neutron_server | length > 0 notify: - "Restart neutron-server container" diff --git a/ansible/roles/nova-cell/handlers/main.yml b/ansible/roles/nova-cell/handlers/main.yml index 81a887217c..403689def2 100644 --- a/ansible/roles/nova-cell/handlers/main.yml +++ b/ansible/roles/nova-cell/handlers/main.yml @@ -10,7 +10,7 @@ name: "{{ service.container_name }}" image: "{{ service.image }}" privileged: "{{ service.privileged | default(False) }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -28,7 +28,7 @@ name: "{{ service.container_name }}" image: "{{ service.image }}" privileged: "{{ service.privileged | default(False) }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -46,7 +46,7 @@ name: "{{ service.container_name }}" image: "{{ service.image }}" privileged: "{{ service.privileged | default(False) }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -64,7 +64,7 @@ name: "{{ service.container_name }}" image: "{{ service.image }}" privileged: "{{ service.privileged | default(False) }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -83,7 +83,7 @@ image: "{{ service.image }}" pid_mode: "{{ service.pid_mode | default('') }}" privileged: "{{ service.privileged | default(False) }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -103,7 +103,7 @@ pid_mode: "{{ service.pid_mode | default('') }}" cgroupns_mode: "{{ service.cgroupns_mode | default(omit) }}" privileged: "{{ service.privileged | default(False) }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" register: restart_nova_libvirt @@ -147,7 +147,7 @@ image: "{{ service.image }}" privileged: "{{ service.privileged | default(False) }}" ipc_mode: "{{ service.ipc_mode }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -164,7 +164,7 @@ name: "{{ service.container_name }}" image: "{{ service.image }}" privileged: "{{ service.privileged | default(False) }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/nova-cell/tasks/check-containers.yml b/ansible/roles/nova-cell/tasks/check-containers.yml index 2549595b5d..1213765a3c 100644 --- a/ansible/roles/nova-cell/tasks/check-containers.yml +++ b/ansible/roles/nova-cell/tasks/check-containers.yml @@ -6,12 +6,12 @@ common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" image: "{{ item.value.image }}" - environment: "{{ item.value.environment|default(omit) }}" - pid_mode: "{{ item.value.pid_mode|default('') }}" - cgroupns_mode: "{{ item.value.cgroupns_mode|default(omit) }}" - ipc_mode: "{{ item.value.ipc_mode|default(omit) }}" - privileged: "{{ item.value.privileged|default(False) }}" - volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" + environment: "{{ item.value.environment | default(omit) }}" + pid_mode: "{{ item.value.pid_mode | default('') }}" + cgroupns_mode: "{{ item.value.cgroupns_mode | default(omit) }}" + ipc_mode: "{{ item.value.ipc_mode | default(omit) }}" + privileged: "{{ item.value.privileged | default(False) }}" + volumes: "{{ item.value.volumes | reject('equalto', '') | list }}" dimensions: "{{ item.value.dimensions }}" healthcheck: "{{ item.value.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/nova-cell/tasks/reload.yml b/ansible/roles/nova-cell/tasks/reload.yml index d55630a086..1644cebef4 100644 --- a/ansible/roles/nova-cell/tasks/reload.yml +++ b/ansible/roles/nova-cell/tasks/reload.yml @@ -27,11 +27,11 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - environment: "{{ service.environment|default(omit) }}" - pid_mode: "{{ service.pid_mode|default('') }}" - ipc_mode: "{{ service.ipc_mode|default(omit) }}" + environment: "{{ service.environment | default(omit) }}" + pid_mode: "{{ service.pid_mode | default('') }}" + ipc_mode: "{{ service.ipc_mode | default(omit) }}" privileged: "{{ service.privileged | default(False) }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/nova/defaults/main.yml b/ansible/roles/nova/defaults/main.yml index edb5aece53..ffdcf2ee1f 100644 --- a/ansible/roles/nova/defaults/main.yml +++ b/ansible/roles/nova/defaults/main.yml @@ -97,7 +97,7 @@ nova_api_enable_healthchecks: "{{ enable_container_healthchecks }}" nova_api_healthcheck_interval: "{{ default_container_healthcheck_interval }}" nova_api_healthcheck_retries: "{{ default_container_healthcheck_retries }}" nova_api_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}" -nova_api_healthcheck_test: ["CMD-SHELL", "healthcheck_curl {{ 'https' if nova_enable_tls_backend | bool else 'http' }}://{{ api_interface_address | put_address_in_context('url') }}:{{ nova_api_listen_port}} "] +nova_api_healthcheck_test: ["CMD-SHELL", "healthcheck_curl {{ 'https' if nova_enable_tls_backend | bool else 'http' }}://{{ api_interface_address | put_address_in_context('url') }}:{{ nova_api_listen_port }} "] nova_api_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}" nova_api_healthcheck: interval: "{{ nova_api_healthcheck_interval }}" diff --git a/ansible/roles/nova/handlers/main.yml b/ansible/roles/nova/handlers/main.yml index 6913324435..0cdd184c50 100644 --- a/ansible/roles/nova/handlers/main.yml +++ b/ansible/roles/nova/handlers/main.yml @@ -10,7 +10,7 @@ name: "{{ service.container_name }}" image: "{{ service.image }}" privileged: "{{ service.privileged | default(False) }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -28,7 +28,7 @@ name: "{{ service.container_name }}" image: "{{ service.image }}" privileged: "{{ service.privileged | default(False) }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -46,7 +46,7 @@ name: "{{ service.container_name }}" image: "{{ service.image }}" privileged: "{{ service.privileged | default(False) }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/nova/tasks/check-containers.yml b/ansible/roles/nova/tasks/check-containers.yml index 1c278f1ce2..480531574a 100644 --- a/ansible/roles/nova/tasks/check-containers.yml +++ b/ansible/roles/nova/tasks/check-containers.yml @@ -6,11 +6,11 @@ common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" image: "{{ item.value.image }}" - environment: "{{ item.value.environment|default(omit) }}" - pid_mode: "{{ item.value.pid_mode|default('') }}" - ipc_mode: "{{ item.value.ipc_mode|default(omit) }}" - privileged: "{{ item.value.privileged|default(False) }}" - volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" + environment: "{{ item.value.environment | default(omit) }}" + pid_mode: "{{ item.value.pid_mode | default('') }}" + ipc_mode: "{{ item.value.ipc_mode | default(omit) }}" + privileged: "{{ item.value.privileged | default(False) }}" + volumes: "{{ item.value.volumes | reject('equalto', '') | list }}" dimensions: "{{ item.value.dimensions }}" healthcheck: "{{ item.value.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/nova/tasks/reload_api.yml b/ansible/roles/nova/tasks/reload_api.yml index 6006852e6a..858f595769 100644 --- a/ansible/roles/nova/tasks/reload_api.yml +++ b/ansible/roles/nova/tasks/reload_api.yml @@ -12,7 +12,7 @@ name: "{{ service.container_name }}" image: "{{ service.image }}" privileged: "{{ service.privileged | default(False) }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/nova/tasks/reload_super_conductor.yml b/ansible/roles/nova/tasks/reload_super_conductor.yml index d745a464d1..edc3a165b4 100644 --- a/ansible/roles/nova/tasks/reload_super_conductor.yml +++ b/ansible/roles/nova/tasks/reload_super_conductor.yml @@ -12,7 +12,7 @@ name: "{{ service.container_name }}" image: "{{ service.image }}" privileged: "{{ service.privileged | default(False) }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/ovn/handlers/main.yml b/ansible/roles/ovn/handlers/main.yml index c9714363f9..94977013f9 100644 --- a/ansible/roles/ovn/handlers/main.yml +++ b/ansible/roles/ovn/handlers/main.yml @@ -9,7 +9,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" when: - kolla_action != "config" @@ -24,7 +24,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" when: - kolla_action != "config" @@ -67,7 +67,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" when: - kolla_action != "config" @@ -82,7 +82,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" when: - kolla_action != "config" diff --git a/ansible/roles/ovn/tasks/check-containers.yml b/ansible/roles/ovn/tasks/check-containers.yml index fe5ac530e9..c08cec2850 100644 --- a/ansible/roles/ovn/tasks/check-containers.yml +++ b/ansible/roles/ovn/tasks/check-containers.yml @@ -6,7 +6,7 @@ common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" image: "{{ item.value.image }}" - volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" + volumes: "{{ item.value.volumes | reject('equalto', '') | list }}" dimensions: "{{ item.value.dimensions }}" when: - inventory_hostname in groups[item.value.group] diff --git a/ansible/roles/ovs-dpdk/defaults/main.yml b/ansible/roles/ovs-dpdk/defaults/main.yml index 03831c93bc..2b052f27dd 100644 --- a/ansible/roles/ovs-dpdk/defaults/main.yml +++ b/ansible/roles/ovs-dpdk/defaults/main.yml @@ -39,9 +39,9 @@ ovsdpdk_services: #################### ovs_bridge_mappings: "{% for bridge in neutron_bridge_name.split(',') %}physnet{{ loop.index0 + 1 }}:{{ bridge }}{% if not loop.last %},{% endif %}{% endfor %}" ovs_port_mappings: "{% for bridge in neutron_bridge_name.split(',') %} {{ neutron_external_interface.split(',')[loop.index0] }}:{{ bridge }}{% if not loop.last %},{% endif %}{% endfor %}" -tunnel_interface_network: "{{ hostvars[inventory_hostname].ansible_facts[dpdk_tunnel_interface]['ipv4']['network']}}/{{hostvars[inventory_hostname].ansible_facts[dpdk_tunnel_interface]['ipv4']['netmask'] }}" +tunnel_interface_network: "{{ hostvars[inventory_hostname].ansible_facts[dpdk_tunnel_interface]['ipv4']['network'] }}/{{ hostvars[inventory_hostname].ansible_facts[dpdk_tunnel_interface]['ipv4']['netmask'] }}" tunnel_interface_cidr: "{{ dpdk_tunnel_interface_address }}/{{ tunnel_interface_network | ipaddr('prefix') }}" -ovs_cidr_mappings: "{% if neutron_bridge_name.split(',')|length != 1 %} {neutron_bridge_name.split(',')[0]}:{{ tunnel_interface_cidr }} {% else %} {{ neutron_bridge_name }}:{{ tunnel_interface_cidr }} {% endif %}" +ovs_cidr_mappings: "{% if neutron_bridge_name.split(',') | length != 1 %} {neutron_bridge_name.split(',')[0]}:{{ tunnel_interface_cidr }} {% else %} {{ neutron_bridge_name }}:{{ tunnel_interface_cidr }} {% endif %}" ovs_mem_channels: 4 ovs_socket_mem: 1024 ovs_hugepage_mountpoint: /dev/hugepages diff --git a/ansible/roles/placement/handlers/main.yml b/ansible/roles/placement/handlers/main.yml index 153dc819bc..a3d0ad103f 100644 --- a/ansible/roles/placement/handlers/main.yml +++ b/ansible/roles/placement/handlers/main.yml @@ -9,7 +9,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/placement/tasks/bootstrap_service.yml b/ansible/roles/placement/tasks/bootstrap_service.yml index 480ff066a7..6669701b8c 100644 --- a/ansible/roles/placement/tasks/bootstrap_service.yml +++ b/ansible/roles/placement/tasks/bootstrap_service.yml @@ -15,6 +15,6 @@ BOOTSTRAP: name: "bootstrap_placement" restart_policy: no - volumes: "{{ placement_api.volumes|reject('equalto', '')|list }}" + volumes: "{{ placement_api.volumes | reject('equalto', '') | list }}" run_once: True delegate_to: "{{ groups[placement_api.group][0] }}" diff --git a/ansible/roles/placement/tasks/check-containers.yml b/ansible/roles/placement/tasks/check-containers.yml index 1203bea79d..be5e92f9de 100644 --- a/ansible/roles/placement/tasks/check-containers.yml +++ b/ansible/roles/placement/tasks/check-containers.yml @@ -6,11 +6,11 @@ common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" image: "{{ item.value.image }}" - environment: "{{ item.value.environment|default(omit) }}" - pid_mode: "{{ item.value.pid_mode|default('') }}" - ipc_mode: "{{ item.value.ipc_mode|default(omit) }}" - privileged: "{{ item.value.privileged|default(False) }}" - volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" + environment: "{{ item.value.environment | default(omit) }}" + pid_mode: "{{ item.value.pid_mode | default('') }}" + ipc_mode: "{{ item.value.ipc_mode | default(omit) }}" + privileged: "{{ item.value.privileged | default(False) }}" + volumes: "{{ item.value.volumes | reject('equalto', '') | list }}" dimensions: "{{ item.value.dimensions }}" healthcheck: "{{ item.value.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/prechecks/tasks/main.yml b/ansible/roles/prechecks/tasks/main.yml index a38f7c550c..01bf0e16cd 100644 --- a/ansible/roles/prechecks/tasks/main.yml +++ b/ansible/roles/prechecks/tasks/main.yml @@ -6,13 +6,13 @@ - include_tasks: timesync_checks.yml when: - - inventory_hostname not in groups['deployment']|default([]) + - inventory_hostname not in groups['deployment'] | default([]) - import_tasks: datetime_checks.yml - include_tasks: port_checks.yml when: - - inventory_hostname not in groups['deployment']|default([]) + - inventory_hostname not in groups['deployment'] | default([]) - import_tasks: service_checks.yml diff --git a/ansible/roles/prometheus/defaults/main.yml b/ansible/roles/prometheus/defaults/main.yml index cf99d2c039..e047ea590b 100644 --- a/ansible/roles/prometheus/defaults/main.yml +++ b/ansible/roles/prometheus/defaults/main.yml @@ -283,7 +283,7 @@ prometheus_openstack_exporter_disabled_volume: "{{ '--disable-service.volume' if prometheus_openstack_exporter_disabled_dns: "{{ '--disable-service.dns' if not enable_designate | bool else '' }}" prometheus_openstack_exporter_disabled_object: "{{ '--disable-service.object-store' if not enable_swift | bool else '' }}" prometheus_openstack_exporter_disabled_lb: "{{ '--disable-service.load-balancer --disable-metric=neutron-loadbalancers --disable-metric=neutron-loadbalancers_not_active' if not enable_octavia | bool else '' }}" -prometheus_openstack_exporter_disabled_items: "{{ [prometheus_openstack_exporter_disabled_volume, prometheus_openstack_exporter_disabled_dns, prometheus_openstack_exporter_disabled_object, prometheus_openstack_exporter_disabled_lb|trim]|join(' ')|trim }}" +prometheus_openstack_exporter_disabled_items: "{{ [prometheus_openstack_exporter_disabled_volume, prometheus_openstack_exporter_disabled_dns, prometheus_openstack_exporter_disabled_object, prometheus_openstack_exporter_disabled_lb | trim] | join(' ') | trim }}" prometheus_blackbox_exporter_cmdline_extras: "" prometheus_cadvisor_cmdline_extras: "--docker_only --store_container_labels=false --disable_metrics=percpu,referenced_memory,cpu_topology,resctrl,udp,advtcp,sched,hugetlb,memory_numa,tcp,process" diff --git a/ansible/roles/prometheus/handlers/main.yml b/ansible/roles/prometheus/handlers/main.yml index c029c51cfa..c9ac641b5f 100644 --- a/ansible/roles/prometheus/handlers/main.yml +++ b/ansible/roles/prometheus/handlers/main.yml @@ -117,7 +117,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" dimensions: "{{ service.dimensions }}" - environment: "{{ service.environment|default(omit) }}" + environment: "{{ service.environment | default(omit) }}" when: - kolla_action != "config" diff --git a/ansible/roles/prometheus/tasks/check-containers.yml b/ansible/roles/prometheus/tasks/check-containers.yml index 0f74139b95..e38d38e4dd 100644 --- a/ansible/roles/prometheus/tasks/check-containers.yml +++ b/ansible/roles/prometheus/tasks/check-containers.yml @@ -6,10 +6,10 @@ common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" image: "{{ item.value.image }}" - pid_mode: "{{ item.value.pid_mode|default('') }}" + pid_mode: "{{ item.value.pid_mode | default('') }}" volumes: "{{ item.value.volumes }}" dimensions: "{{ item.value.dimensions }}" - environment: "{{ item.value.environment|default(omit) }}" + environment: "{{ item.value.environment | default(omit) }}" when: - inventory_hostname in groups[item.value.group] - item.value.enabled | bool diff --git a/ansible/roles/rabbitmq/tasks/upgrade.yml b/ansible/roles/rabbitmq/tasks/upgrade.yml index c4aa2a8d63..f756843ac1 100644 --- a/ansible/roles/rabbitmq/tasks/upgrade.yml +++ b/ansible/roles/rabbitmq/tasks/upgrade.yml @@ -50,7 +50,7 @@ common_options: "{{ docker_common_options }}" name: "{{ project_name }}" when: - - inventory_hostname != groups[role_rabbitmq_groups]|first + - inventory_hostname != groups[role_rabbitmq_groups] | first - rabbitmq_differs['result'] - name: Stopping rabbitmq on the first node @@ -60,7 +60,7 @@ common_options: "{{ docker_common_options }}" name: "{{ project_name }}" when: - - inventory_hostname == groups[role_rabbitmq_groups]|first + - inventory_hostname == groups[role_rabbitmq_groups] | first - rabbitmq_differs['result'] - name: Flush handlers diff --git a/ansible/roles/sahara/handlers/main.yml b/ansible/roles/sahara/handlers/main.yml index ee585fe033..d96468297e 100644 --- a/ansible/roles/sahara/handlers/main.yml +++ b/ansible/roles/sahara/handlers/main.yml @@ -9,7 +9,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -25,7 +25,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" privileged: "{{ service.privileged | default(False) }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" diff --git a/ansible/roles/sahara/tasks/bootstrap_service.yml b/ansible/roles/sahara/tasks/bootstrap_service.yml index 9a9a8395fd..6f78f9d867 100644 --- a/ansible/roles/sahara/tasks/bootstrap_service.yml +++ b/ansible/roles/sahara/tasks/bootstrap_service.yml @@ -15,6 +15,6 @@ BOOTSTRAP: name: "bootstrap_sahara" restart_policy: no - volumes: "{{ sahara_api.volumes|reject('equalto', '')|list }}" + volumes: "{{ sahara_api.volumes | reject('equalto', '') | list }}" run_once: True delegate_to: "{{ groups[sahara_api.group][0] }}" diff --git a/ansible/roles/sahara/tasks/check-containers.yml b/ansible/roles/sahara/tasks/check-containers.yml index 84c59a4abb..c224d54773 100644 --- a/ansible/roles/sahara/tasks/check-containers.yml +++ b/ansible/roles/sahara/tasks/check-containers.yml @@ -7,7 +7,7 @@ name: "{{ item.value.container_name }}" image: "{{ item.value.image }}" privileged: "{{ item.value.privileged | default(False) }}" - volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" + volumes: "{{ item.value.volumes | reject('equalto', '') | list }}" dimensions: "{{ item.value.dimensions }}" healthcheck: "{{ item.value.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/senlin/handlers/main.yml b/ansible/roles/senlin/handlers/main.yml index be8ba86113..bdf06bf743 100644 --- a/ansible/roles/senlin/handlers/main.yml +++ b/ansible/roles/senlin/handlers/main.yml @@ -9,7 +9,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -25,7 +25,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -41,7 +41,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -57,7 +57,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/senlin/tasks/bootstrap_service.yml b/ansible/roles/senlin/tasks/bootstrap_service.yml index abbfa2e834..318201f5a7 100644 --- a/ansible/roles/senlin/tasks/bootstrap_service.yml +++ b/ansible/roles/senlin/tasks/bootstrap_service.yml @@ -15,6 +15,6 @@ BOOTSTRAP: name: "bootstrap_senlin" restart_policy: no - volumes: "{{ senlin_api.volumes|reject('equalto', '')|list }}" + volumes: "{{ senlin_api.volumes | reject('equalto', '') | list }}" run_once: True delegate_to: "{{ groups[senlin_api.group][0] }}" diff --git a/ansible/roles/senlin/tasks/check-containers.yml b/ansible/roles/senlin/tasks/check-containers.yml index 7596400ede..0fcaa54a2e 100644 --- a/ansible/roles/senlin/tasks/check-containers.yml +++ b/ansible/roles/senlin/tasks/check-containers.yml @@ -6,7 +6,7 @@ common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" image: "{{ item.value.image }}" - volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" + volumes: "{{ item.value.volumes | reject('equalto', '') | list }}" dimensions: "{{ item.value.dimensions }}" healthcheck: "{{ item.value.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/solum/handlers/main.yml b/ansible/roles/solum/handlers/main.yml index 1f109640c9..c60c27d227 100644 --- a/ansible/roles/solum/handlers/main.yml +++ b/ansible/roles/solum/handlers/main.yml @@ -9,7 +9,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -25,7 +25,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -41,7 +41,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -57,7 +57,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/solum/tasks/bootstrap_service.yml b/ansible/roles/solum/tasks/bootstrap_service.yml index 231b963b69..47eadb47e4 100644 --- a/ansible/roles/solum/tasks/bootstrap_service.yml +++ b/ansible/roles/solum/tasks/bootstrap_service.yml @@ -15,6 +15,6 @@ BOOTSTRAP: name: "bootstrap_solum" restart_policy: no - volumes: "{{ solum_api.volumes|reject('equalto', '')|list }}" + volumes: "{{ solum_api.volumes | reject('equalto', '') | list }}" run_once: True delegate_to: "{{ groups[solum_api.group][0] }}" diff --git a/ansible/roles/solum/tasks/check-containers.yml b/ansible/roles/solum/tasks/check-containers.yml index b9179e037d..42772b6462 100644 --- a/ansible/roles/solum/tasks/check-containers.yml +++ b/ansible/roles/solum/tasks/check-containers.yml @@ -6,7 +6,7 @@ common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" image: "{{ item.value.image }}" - volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" + volumes: "{{ item.value.volumes | reject('equalto', '') | list }}" dimensions: "{{ item.value.dimensions }}" healthcheck: "{{ item.value.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/storm/tasks/precheck.yml b/ansible/roles/storm/tasks/precheck.yml index 266645c84e..cb3ac75bdf 100644 --- a/ansible/roles/storm/tasks/precheck.yml +++ b/ansible/roles/storm/tasks/precheck.yml @@ -42,7 +42,7 @@ connect_timeout: 1 timeout: 1 state: stopped - with_sequence: "start={{ storm_worker_port_range.start|int }} end={{ storm_worker_port_range.end|int }}" + with_sequence: "start={{ storm_worker_port_range.start | int }} end={{ storm_worker_port_range.end | int }}" when: - container_facts['storm_worker'] is not defined - inventory_hostname in groups['storm-worker'] diff --git a/ansible/roles/swift/tasks/start.yml b/ansible/roles/swift/tasks/start.yml index 5475a45ad6..a09aa95bd1 100644 --- a/ansible/roles/swift/tasks/start.yml +++ b/ansible/roles/swift/tasks/start.yml @@ -7,7 +7,7 @@ match_mode={{ swift_devices_match_mode }}" register: swift_disk_lookup changed_when: swift_disk_lookup.stdout.find('localhost | SUCCESS => ') != -1 and - (swift_disk_lookup.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed + (swift_disk_lookup.stdout.split('localhost | SUCCESS => ')[1] | from_json).changed failed_when: swift_disk_lookup.stdout.split()[2] != 'SUCCESS' when: inventory_hostname in groups['swift-account-server'] or inventory_hostname in groups['swift-container-server'] or @@ -15,7 +15,7 @@ - name: Reading data from variable set_fact: - swift_disks: "{{ (swift_disk_lookup.stdout.split('localhost | SUCCESS => ')[1]|from_json).disks|from_json }}" + swift_disks: "{{ (swift_disk_lookup.stdout.split('localhost | SUCCESS => ')[1] | from_json).disks | from_json }}" when: inventory_hostname in groups['swift-account-server'] or inventory_hostname in groups['swift-container-server'] or inventory_hostname in groups['swift-object-server'] diff --git a/ansible/roles/tacker/defaults/main.yml b/ansible/roles/tacker/defaults/main.yml index 312db079f0..d7b11dccb5 100644 --- a/ansible/roles/tacker/defaults/main.yml +++ b/ansible/roles/tacker/defaults/main.yml @@ -108,7 +108,7 @@ tacker_conductor_extra_volumes: "{{ tacker_extra_volumes }}" # NOTE(yoctozepto): Starting in Train, this variable is used to co-locate all # Tacker services on one host since we do not provide shared filesystem # to satisfy kolla_tacker_csar_files volume needs. -tacker_hosts: "{{ [groups['tacker']|first] }}" +tacker_hosts: "{{ [groups['tacker'] | first] }}" #################### # OpenStack diff --git a/ansible/roles/tacker/handlers/main.yml b/ansible/roles/tacker/handlers/main.yml index 2b358e77d2..9976ad07e0 100644 --- a/ansible/roles/tacker/handlers/main.yml +++ b/ansible/roles/tacker/handlers/main.yml @@ -9,7 +9,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -25,7 +25,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/tacker/tasks/bootstrap_service.yml b/ansible/roles/tacker/tasks/bootstrap_service.yml index 573fcc7f90..7ccfa80888 100644 --- a/ansible/roles/tacker/tasks/bootstrap_service.yml +++ b/ansible/roles/tacker/tasks/bootstrap_service.yml @@ -15,6 +15,6 @@ BOOTSTRAP: name: "bootstrap_tacker" restart_policy: no - volumes: "{{ tacker_server.volumes|reject('equalto', '')|list }}" + volumes: "{{ tacker_server.volumes | reject('equalto', '') | list }}" run_once: True delegate_to: "{{ groups[tacker_server.group][0] }}" diff --git a/ansible/roles/tacker/tasks/check-containers.yml b/ansible/roles/tacker/tasks/check-containers.yml index 2acf0e563d..df89b9e5ef 100644 --- a/ansible/roles/tacker/tasks/check-containers.yml +++ b/ansible/roles/tacker/tasks/check-containers.yml @@ -5,7 +5,7 @@ action: "compare_container" name: "{{ item.value.container_name }}" image: "{{ item.value.image }}" - volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" + volumes: "{{ item.value.volumes | reject('equalto', '') | list }}" dimensions: "{{ item.value.dimensions }}" healthcheck: "{{ item.value.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/telegraf/handlers/main.yml b/ansible/roles/telegraf/handlers/main.yml index c80d011d33..01b85a27ff 100644 --- a/ansible/roles/telegraf/handlers/main.yml +++ b/ansible/roles/telegraf/handlers/main.yml @@ -13,7 +13,7 @@ HOST_PROC: "/rootfs/proc" HOST_SYS: "/rootfs/sys" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" when: - kolla_action != "config" diff --git a/ansible/roles/trove/handlers/main.yml b/ansible/roles/trove/handlers/main.yml index 10bd498179..245a1858ff 100644 --- a/ansible/roles/trove/handlers/main.yml +++ b/ansible/roles/trove/handlers/main.yml @@ -9,7 +9,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -25,7 +25,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -41,7 +41,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/trove/tasks/bootstrap_service.yml b/ansible/roles/trove/tasks/bootstrap_service.yml index 8e4f5e2735..72603c84bc 100644 --- a/ansible/roles/trove/tasks/bootstrap_service.yml +++ b/ansible/roles/trove/tasks/bootstrap_service.yml @@ -15,6 +15,6 @@ BOOTSTRAP: name: "bootstrap_trove" restart_policy: no - volumes: "{{ trove_api.volumes|reject('equalto', '')|list }}" + volumes: "{{ trove_api.volumes | reject('equalto', '') | list }}" run_once: True delegate_to: "{{ groups[trove_api.group][0] }}" diff --git a/ansible/roles/trove/tasks/check-containers.yml b/ansible/roles/trove/tasks/check-containers.yml index 32e6303893..3c4cbd8f4c 100644 --- a/ansible/roles/trove/tasks/check-containers.yml +++ b/ansible/roles/trove/tasks/check-containers.yml @@ -6,7 +6,7 @@ common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" image: "{{ item.value.image }}" - volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" + volumes: "{{ item.value.volumes | reject('equalto', '') | list }}" dimensions: "{{ item.value.dimensions }}" healthcheck: "{{ item.value.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/venus/handlers/main.yml b/ansible/roles/venus/handlers/main.yml index 7fc63877e6..f1b17b7fe5 100644 --- a/ansible/roles/venus/handlers/main.yml +++ b/ansible/roles/venus/handlers/main.yml @@ -9,7 +9,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -25,7 +25,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/venus/tasks/check-containers.yml b/ansible/roles/venus/tasks/check-containers.yml index 9601bb2fb5..c895320362 100644 --- a/ansible/roles/venus/tasks/check-containers.yml +++ b/ansible/roles/venus/tasks/check-containers.yml @@ -6,7 +6,7 @@ common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" image: "{{ item.value.image }}" - volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" + volumes: "{{ item.value.volumes | reject('equalto', '') | list }}" dimensions: "{{ item.value.dimensions }}" healthcheck: "{{ item.value.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/watcher/handlers/main.yml b/ansible/roles/watcher/handlers/main.yml index cb061abef3..89fe153c4a 100644 --- a/ansible/roles/watcher/handlers/main.yml +++ b/ansible/roles/watcher/handlers/main.yml @@ -9,7 +9,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -25,7 +25,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: @@ -41,7 +41,7 @@ common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" image: "{{ service.image }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/watcher/tasks/bootstrap_service.yml b/ansible/roles/watcher/tasks/bootstrap_service.yml index 1323bddd4c..789348a3d3 100644 --- a/ansible/roles/watcher/tasks/bootstrap_service.yml +++ b/ansible/roles/watcher/tasks/bootstrap_service.yml @@ -15,6 +15,6 @@ BOOTSTRAP: name: "bootstrap_watcher" restart_policy: no - volumes: "{{ watcher_api.volumes|reject('equalto', '')|list }}" + volumes: "{{ watcher_api.volumes | reject('equalto', '') | list }}" run_once: True delegate_to: "{{ groups[watcher_api.group][0] }}" diff --git a/ansible/roles/watcher/tasks/check-containers.yml b/ansible/roles/watcher/tasks/check-containers.yml index 4978ca04da..1c20ba4d69 100644 --- a/ansible/roles/watcher/tasks/check-containers.yml +++ b/ansible/roles/watcher/tasks/check-containers.yml @@ -6,7 +6,7 @@ common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" image: "{{ item.value.image }}" - volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" + volumes: "{{ item.value.volumes | reject('equalto', '') | list }}" dimensions: "{{ item.value.dimensions }}" healthcheck: "{{ item.value.healthcheck | default(omit) }}" when: diff --git a/ansible/roles/zun/handlers/main.yml b/ansible/roles/zun/handlers/main.yml index 0813ccf134..d4bdf728bf 100644 --- a/ansible/roles/zun/handlers/main.yml +++ b/ansible/roles/zun/handlers/main.yml @@ -10,7 +10,7 @@ name: "{{ service.container_name }}" image: "{{ service.image }}" privileged: "{{ service.privileged | default(False) }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" listen: @@ -29,7 +29,7 @@ name: "{{ service.container_name }}" image: "{{ service.image }}" privileged: "{{ service.privileged | default(False) }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" listen: @@ -48,7 +48,7 @@ name: "{{ service.container_name }}" image: "{{ service.image }}" privileged: "{{ service.privileged | default(False) }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" listen: @@ -67,7 +67,7 @@ name: "{{ service.container_name }}" image: "{{ service.image }}" privileged: "{{ service.privileged | default(False) }}" - volumes: "{{ service.volumes|reject('equalto', '')|list }}" + volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" listen: diff --git a/ansible/roles/zun/tasks/bootstrap_service.yml b/ansible/roles/zun/tasks/bootstrap_service.yml index 686d393e8f..cc694f57df 100644 --- a/ansible/roles/zun/tasks/bootstrap_service.yml +++ b/ansible/roles/zun/tasks/bootstrap_service.yml @@ -15,6 +15,6 @@ BOOTSTRAP: name: "bootstrap_zun" restart_policy: no - volumes: "{{ zun_api.volumes|reject('equalto', '')|list }}" + volumes: "{{ zun_api.volumes | reject('equalto', '') | list }}" run_once: True delegate_to: "{{ groups[zun_api.group][0] }}" diff --git a/ansible/roles/zun/tasks/check-containers.yml b/ansible/roles/zun/tasks/check-containers.yml index 9de35c7a00..b6576eb206 100644 --- a/ansible/roles/zun/tasks/check-containers.yml +++ b/ansible/roles/zun/tasks/check-containers.yml @@ -7,7 +7,7 @@ name: "{{ item.value.container_name }}" image: "{{ item.value.image }}" privileged: "{{ item.value.privileged | default(False) }}" - volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" + volumes: "{{ item.value.volumes | reject('equalto', '') | list }}" dimensions: "{{ item.value.dimensions }}" healthcheck: "{{ item.value.healthcheck | default(omit) }}" when: