openstack/openstack-ansible
Code Issues Proposed changes

Merge "ansible-lint: Fix yaml[truthy]"

Browse Source
This commit is contained in:
Zuul
2026-05-15 23:33:39 +00:00
committed by Gerrit Code Review
parent ead4fc86e3 6b28afd6cf
commit 41507a45e4
13 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
etc/openstack_deploy/openstack_user_config.yml.multibond.example
+4 -4
View File
@@ -33,7 +33,7 @@ global_overrides:
is_management_address: true
#
# The below provider network defines details related to overlay traffic,
# including the range of VXLAN VNIs to assign to project/tenant networks
# including the range of VXLAN VNIs to assign to project networks
# and other attributes.
#
- network:
@@ -49,9 +49,9 @@ global_overrides:
#
# The below provider network define details related to a given provider
# network: physnet1. Details include the name of the veth interface to
# connect to the bridge when agent on_metal is False (container_interface)
# connect to the bridge when agent on_metal is false (container_interface)
# or the physical interface to connect to the bridge when agent on_metal
# is True (host_bind_override), as well as the network type. The provider
# is true (host_bind_override), as well as the network type. The provider
# network name (net_name) will be used to build a physical network mapping
# to a network interface using either container_interface or
# host_bind_override (when defined).
@@ -99,7 +99,7 @@ shared_infra_hosts:
infra3:
ip: 172.29.236.13
# repository (apt cache, python packages, etc)
# repository (apt or dnf cache, python packages, etc)
repo_infra_hosts:
infra1:
ip: 172.29.236.11
etc/openstack_deploy/openstack_user_config.yml.provnet-group.example
+4 -4
View File
@@ -33,7 +33,7 @@ global_overrides:
is_management_address: true
#
# The below provider network defines details related to vxlan traffic,
# including the range of VNIs to assign to project/tenant networks and
# including the range of VNIs to assign to project networks and
# other attributes.
#
# The network details will be used to populate the respective network
@@ -53,9 +53,9 @@ global_overrides:
#
# The below provider network(s) define details related to a given provider
# network: physnet1. Details include the name of the veth interface to
# connect to the bridge when agent on_metal is False (container_interface)
# connect to the bridge when agent on_metal is false (container_interface)
# or the physical interface to connect to the bridge when agent on_metal
# is True (host_bind_override), as well as the network type. The provider
# is true (host_bind_override), as well as the network type. The provider
# network name (net_name) will be used to build a physical network mapping
# to a network interface; either container_interface or host_bind_override
# (when defined).
@@ -137,7 +137,7 @@ shared_infra_hosts:
infra3:
ip: 172.29.236.13
# repository (apt cache, python packages, etc)
# repository (apt or dnf cache, python packages, etc)
repo_infra_hosts:
infra1:
ip: 172.29.236.11
etc/openstack_deploy/openstack_user_config.yml.singlebond.example
+4 -4
View File
@@ -33,7 +33,7 @@ global_overrides:
is_management_address: true
#
# The below provider network defines details related to overlay traffic,
# including the range of VXLAN VNIs to assign to project/tenant networks
# including the range of VXLAN VNIs to assign to project networks
# and other attributes.
#
- network:
@@ -49,9 +49,9 @@ global_overrides:
#
# The below provider network define details related to a given provider
# network: physnet1. Details include the name of the veth interface to
# connect to the bridge when agent on_metal is False (container_interface)
# connect to the bridge when agent on_metal is false (container_interface)
# or the physical interface to connect to the bridge when agent on_metal
# is True (host_bind_override), as well as the network type. The provider
# is true (host_bind_override), as well as the network type. The provider
# network name (net_name) will be used to build a physical network mapping
# to a network interface using either container_interface or
# host_bind_override (when defined).
@@ -99,7 +99,7 @@ shared_infra_hosts:
infra3:
ip: 172.29.236.13
# repository (apt cache, python packages, etc)
# repository (apt or dnf cache, python packages, etc)
repo_infra_hosts:
infra1:
ip: 172.29.236.11
etc/openstack_deploy/user_variables.yml.az.example
+3 -3
View File
@@ -37,7 +37,7 @@ cinder_storage_availability_zone: "{{ az_name }}"
# Glance to use Swift as a backend
glance_default_store: swift
glance_use_uwsgi: False
glance_use_uwsgi: false
# Neutron variables
neutron_availability_zone: "{{ az_name }}"
@@ -45,7 +45,7 @@ neutron_default_availability_zones:
- az1
- az2
- az3
neutron_ovn_distributed_fip: True
neutron_ovn_distributed_fip: true
neutron_plugin_type: ml2.ovn
neutron_plugin_base:
- ovn-router
@@ -61,7 +61,7 @@ neutron_provider_networks:
network_interface_mappings: "br-vlan:bond0"
# Nova variables
nova_cinder_rbd_inuse: True
nova_cinder_rbd_inuse: true
nova_glance_rbd_inuse: false
nova_libvirt_images_rbd_pool: ""
nova_libvirt_disk_cachemodes: network=writeback,file=directsync
inventory/group_vars/all/haproxy.yml
+1 -1
View File
@@ -34,7 +34,7 @@ openstack_haproxy_stick_table:
# CA used by haproxy to verify backend certificate.
# It can contain CA path or a boolean:
# (true = use system CA, false = cert validation disabled)
openstack_haproxy_backend_ca: True
openstack_haproxy_backend_ca: true
# apply the stick table as default for all backends
haproxy_stick_table: "{{ openstack_haproxy_stick_table }}"
inventory/group_vars/all/infra.yml
+6 -6
View File
@@ -13,11 +13,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
## Rabbit options
## RabbitMQ options
rabbitmq_host_group: "rabbitmq_all"
rabbitmq_port: "{{ (rabbitmq_use_ssl | bool) | ternary(5671, 5672) }}"
rabbitmq_use_ssl: True
rabbitmq_use_ssl: true
rabbitmq_servers: >-
{{
groups[rabbitmq_host_group]
@@ -25,8 +25,8 @@ rabbitmq_servers: >-
| list | join(',')
}}
# If you do not want to use quorum queues, set rabbitmq_queue_replication to False
rabbitmq_queue_replication: True
# If you do not want to use quorum queues, set rabbitmq_queue_replication to false
rabbitmq_queue_replication: true
rabbitmq_policies:
- name: CQv2
@@ -36,7 +36,7 @@ rabbitmq_policies:
queue-version: 2
state: >-
{{
((oslomsg_rabbit_quorum_queues | default(True) or not rabbitmq_queue_replication) and rabbitmq_install_method | default('') != 'distro'
((oslomsg_rabbit_quorum_queues | default(true) or not rabbitmq_queue_replication) and rabbitmq_install_method | default('') != 'distro'
) | ternary('present', 'absent')
}}
# The following is an example of an additional policy which applies to fanout/stream queues only
@@ -52,7 +52,7 @@ rabbitmq_policies:
# stream-max-segment-size-bytes: 1000000
# state: >-
# {{
# ((oslomsg_rabbit_quorum_queues | default(True) or not rabbitmq_queue_replication) and rabbitmq_install_method | default('') != 'distro'
# ((oslomsg_rabbit_quorum_queues | default(true) or not rabbitmq_queue_replication) and rabbitmq_install_method | default('') != 'distro'
# ) | ternary('present', 'absent')
# }}
inventory/group_vars/blazar_all/haproxy_service.yml
+1 -1
View File
@@ -24,7 +24,7 @@ haproxy_blazar_api_service:
- 'send hdr User-Agent "osa-haproxy-healthcheck" meth HEAD'
- 'expect rstatus (200|401)'
haproxy_backend_ssl: "{{ blazar_backend_ssl | default(openstack_service_backend_ssl) }}"
haproxy_backend_ca: "{{ openstack_haproxy_backend_ca | default(True) }}"
haproxy_backend_ca: "{{ openstack_haproxy_backend_ca | default(true) }}"
haproxy_accept_both_protocols: "{{ blazar_accept_both_protocols | default(openstack_service_accept_both_protocols) }}"
haproxy_service_enabled: "{{ groups['blazar_api'] is defined and groups['blazar_api'] | length > 0 }}"
inventory/group_vars/ceph_all.yml
+5 -5
View File
@@ -32,21 +32,21 @@ ceph_conf_overrides_manila:
# To extend ceph_conf_overrides use the ceph_conf_overrides_custom which will
# combine any ceph_conf_overrides with other RGW specific overrides.
ceph_conf_overrides_custom: {}
ceph_conf_overrides: "{{ (ceph_conf_overrides_rgw | default({})) | combine(ceph_conf_overrides_manila, recursive=True) | combine(ceph_conf_overrides_custom, recursive=True) | combine(ceph_conf_overrides_log, recursive=True) }}"
ceph_conf_overrides: "{{ (ceph_conf_overrides_rgw | default({})) | combine(ceph_conf_overrides_manila, recursive=true) | combine(ceph_conf_overrides_custom, recursive=true) | combine(ceph_conf_overrides_log, recursive=true) }}"
# Disable the NFS gateway PPA and package install by default as it is not
# needed.
nfs_file_gw: "{{ (('ceph_nfs' in groups) and ('ceph_mds' in groups)) }}"
nfs_obj_gw: False
nfs_ganesha_stable: True
nfs_obj_gw: false
nfs_ganesha_stable: true
nfs_ganesha_stable_deb_repo: http://ppa.launchpad.net/nfs-ganesha/nfs-ganesha-5/ubuntu
libntirpc_stable_deb_repo: http://ppa.launchpad.net/nfs-ganesha/libntirpc-5/ubuntu
# NTP in an OSA environment is handled by ansible-hardening using chrony
# ceph-ansible's default enabling of ntpd conflicts with the OSA defaults
ntp_service_enabled: False
ntp_service_enabled: false
dashboard_enabled: True
dashboard_enabled: true
openstack_glance_pool:
name: "images"
inventory/group_vars/cinder_volume.yml
+1 -1
View File
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# cinder_backend_rbd_inuse: True if current host has an rbd backend
# cinder_backend_rbd_inuse: true if current host has an rbd backend
# this is defined identically downstream in the os_cinder role, but redefined
# here so it can be consumed by the nova group vars
cinder_backend_rbd_inuse: '{{ (cinder_backends|default("")|to_json).find("cinder.volume.drivers.rbd.RBDDriver") != -1 }}'
inventory/group_vars/glance_all/haproxy_service.yml
+1 -1
View File
@@ -23,7 +23,7 @@ haproxy_glance_api_service:
haproxy_balance_alg: source
haproxy_backend_httpcheck_options:
- 'send hdr User-Agent "osa-haproxy-healthcheck" meth GET uri /healthcheck'
haproxy_backend_ssl: "{{ (glance_use_uwsgi | default(True)) | ternary((glance_backend_ssl | default(openstack_service_backend_ssl)), False) }}"
haproxy_backend_ssl: "{{ (glance_use_uwsgi | default(true)) | ternary((glance_backend_ssl | default(openstack_service_backend_ssl)), false) }}"
haproxy_backend_ca: "{{ glance_haproxy_backend_ca | default(openstack_haproxy_backend_ca) }}"
haproxy_accept_both_protocols: "{{ glance_accept_both_protocols | default(openstack_service_accept_both_protocols) }}"
haproxy_service_enabled: "{{ groups['glance_api'] is defined and groups['glance_api'] | length > 0 }}"
inventory/group_vars/haproxy/keepalived.yml
+1 -1
View File
@@ -74,4 +74,4 @@ _keepalived_default_instances:
- "{{ haproxy_keepalived_internal_vip_cidr | default('169.254.2.1/24') }} dev {{ haproxy_keepalived_internal_interface | default(management_bridge) }}"
track_scripts: "{{ keepalived_scripts | dict2items | json_query('[*].{name: key, instance: value.instance}') | rejectattr('instance', 'equalto', 'external') | map(attribute='name') | list }}"
keepalived_instances: "{{ _keepalived_default_instances | combine(keepalived_instances_overrides | default({}), recursive=True) }}"
keepalived_instances: "{{ _keepalived_default_instances | combine(keepalived_instances_overrides | default({}), recursive=true) }}"
inventory/group_vars/physical_hosts.yml
+1 -1
View File
@@ -1,2 +1,2 @@
---
is_metal: True
is_metal: true
inventory/group_vars/repo_all.yml
+1 -1
View File
@@ -35,7 +35,7 @@ repo_server_systemd_mounts:
? glusterd.service
? network-online.target
openstack_repo_server_enable_glusterfs: True
openstack_repo_server_enable_glusterfs: true
haproxy_repo_service:
haproxy_service_name: repo_all