openstack/kolla-ansible
Code Issues Proposed changes

Fix var-spacing

Browse Source 
ansible-lint introduced var-spacing - let's fix our code.

Change-Id: I0d8aaf3c522a5a6a5495032f6dbed8a2be0251f0
This commit is contained in:
Michal Nasiadka 2022-07-25 09:52:05 +02:00 committed by Radosław Piliszek
parent 0f2c56ca54
commit dcf5a8b65f
121 changed files with 244 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ansible/group_vars/all.yml
View File

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

8
ansible/roles/aodh/handlers/main.yml
View File

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

2
ansible/roles/aodh/tasks/bootstrap_service.yml
View File

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

2
ansible/roles/aodh/tasks/check-containers.yml
View File

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

2
ansible/roles/barbican/defaults/main.yml
View File

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

6
ansible/roles/barbican/handlers/main.yml
View File

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

2
ansible/roles/barbican/tasks/bootstrap_service.yml
View File

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

2
ansible/roles/barbican/tasks/check-containers.yml
View File

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

4
ansible/roles/blazar/handlers/main.yml
View File

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

2
ansible/roles/blazar/tasks/bootstrap_service.yml
View File

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

2
ansible/roles/blazar/tasks/check-containers.yml
View File

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

6
ansible/roles/ceilometer/handlers/main.yml
View File

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

2
ansible/roles/ceilometer/tasks/bootstrap_service.yml
View File

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

2
ansible/roles/ceilometer/tasks/check-containers.yml
View File

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

2
ansible/roles/ceilometer/templates/pipeline.yaml.j2
View File

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

4
ansible/roles/cinder/defaults/main.yml
View File

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

2
ansible/roles/cinder/tasks/bootstrap_service.yml
View File

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

2
ansible/roles/cloudkitty/defaults/main.yml
View File

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

4
ansible/roles/cloudkitty/handlers/main.yml
View File

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

2
ansible/roles/cloudkitty/tasks/bootstrap_service.yml
View File

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

2
ansible/roles/cloudkitty/tasks/check-containers.yml
View File

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

14
ansible/roles/designate/handlers/main.yml
View File

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

2
ansible/roles/designate/tasks/bootstrap_service.yml
View File

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

2
ansible/roles/designate/tasks/check-containers.yml
View File

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

2
ansible/roles/elasticsearch/defaults/main.yml
View File

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

2
ansible/roles/elasticsearch/tasks/check-containers.yml
View File

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

2
ansible/roles/freezer/handlers/main.yml
View File

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

4
ansible/roles/glance/defaults/main.yml
View File

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

4
ansible/roles/glance/handlers/main.yml
View File

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

2
ansible/roles/glance/tasks/bootstrap_service.yml
View File

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

2
ansible/roles/glance/tasks/check-containers.yml
View File

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

2
ansible/roles/glance/tasks/precheck.yml
View File

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

6
ansible/roles/glance/tasks/rolling_upgrade.yml
View File

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

6
ansible/roles/grafana/handlers/main.yml
View File

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

2
ansible/roles/grafana/tasks/post_config.yml
View File

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

2
ansible/roles/grafana/tasks/upgrade.yml
View File

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

6
ansible/roles/hacluster/handlers/main.yml
View File

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

6
ansible/roles/heat/handlers/main.yml
View File

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

2
ansible/roles/heat/tasks/bootstrap_service.yml
View File

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

2
ansible/roles/heat/tasks/check-containers.yml
View File

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

8
ansible/roles/horizon/defaults/main.yml
View File

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

6
ansible/roles/ironic/handlers/main.yml
View File

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

6
ansible/roles/ironic/tasks/bootstrap_service.yml
View File

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

6
ansible/roles/ironic/tasks/check-containers.yml
View File

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

4
ansible/roles/iscsi/handlers/main.yml
View File

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

2
ansible/roles/iscsi/tasks/check-containers.yml
View File

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

10
ansible/roles/keystone/handlers/main.yml
View File

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

4
ansible/roles/keystone/tasks/bootstrap_service.yml
View File

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

2
ansible/roles/keystone/tasks/check-containers.yml
View File

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

2
ansible/roles/keystone/tasks/config.yml
View File

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

2
ansible/roles/kuryr/tasks/check-containers.yml
View File

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

6
ansible/roles/loadbalancer/tasks/precheck.yml
View File

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

4
ansible/roles/magnum/handlers/main.yml
View File

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

2
ansible/roles/magnum/tasks/bootstrap_service.yml
View File

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

2
ansible/roles/magnum/tasks/check-containers.yml
View File

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

2
ansible/roles/manila/defaults/main.yml
View File

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

8
ansible/roles/manila/handlers/main.yml
View File

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

2
ansible/roles/manila/tasks/bootstrap_service.yml
View File

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

4
ansible/roles/manila/tasks/check-containers.yml
View File

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

4
ansible/roles/mariadb/defaults/main.yml
View File

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

8
ansible/roles/masakari/handlers/main.yml
View File

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

2
ansible/roles/masakari/tasks/bootstrap_service.yml
View File

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

2
ansible/roles/memcached/defaults/main.yml
View File

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

8
ansible/roles/mistral/handlers/main.yml
View File

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

2
ansible/roles/mistral/tasks/bootstrap_service.yml
View File

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

2
ansible/roles/mistral/tasks/check-containers.yml
View File

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

2
ansible/roles/monasca/defaults/main.yml
View File

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

4
ansible/roles/monasca/handlers/main.yml
View File

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

2
ansible/roles/monasca/tasks/check-containers.yml
View File

@ -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') }}"

2
ansible/roles/monasca/tasks/precheck.yml
View File

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

2
ansible/roles/monasca/tasks/upgrade.yml
View File

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

2
ansible/roles/multipathd/handlers/main.yml
View File

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

4
ansible/roles/neutron/defaults/main.yml
View File

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

26
ansible/roles/neutron/handlers/main.yml
View File

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

2
ansible/roles/neutron/tasks/rolling_upgrade.yml
View File

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

16
ansible/roles/nova-cell/handlers/main.yml
View File

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

12
ansible/roles/nova-cell/tasks/check-containers.yml
View File

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

8
ansible/roles/nova-cell/tasks/reload.yml
View File

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

2
ansible/roles/nova/defaults/main.yml
View File

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

6
ansible/roles/nova/handlers/main.yml
View File

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

10
ansible/roles/nova/tasks/check-containers.yml
View File

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

2
ansible/roles/nova/tasks/reload_api.yml
View File

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

2
ansible/roles/nova/tasks/reload_super_conductor.yml
View File

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

8
ansible/roles/ovn/handlers/main.yml
View File

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

2
ansible/roles/ovn/tasks/check-containers.yml
View File

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

4
ansible/roles/ovs-dpdk/defaults/main.yml
View File

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

2
ansible/roles/placement/handlers/main.yml
View File

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

2
ansible/roles/placement/tasks/bootstrap_service.yml
View File

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

10
ansible/roles/placement/tasks/check-containers.yml
View File

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

4
ansible/roles/prechecks/tasks/main.yml
View File

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

2
ansible/roles/prometheus/defaults/main.yml
View File

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

2
ansible/roles/prometheus/handlers/main.yml
View File

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

4
ansible/roles/prometheus/tasks/check-containers.yml
View File

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

4
ansible/roles/rabbitmq/tasks/upgrade.yml
View File

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

4
ansible/roles/sahara/handlers/main.yml
View File

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

2
ansible/roles/sahara/tasks/bootstrap_service.yml
View File

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

2
ansible/roles/sahara/tasks/check-containers.yml
View File

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

8
ansible/roles/senlin/handlers/main.yml
View File

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

2
ansible/roles/senlin/tasks/bootstrap_service.yml
View File

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

2
ansible/roles/senlin/tasks/check-containers.yml
View File

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

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