diff options
| author | Zuul <zuul@review.opendev.org> | 2025-11-24 22:10:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-11-24 22:10:57 +0000 |
| commit | 40cef82d85722bce09002f1490e2354fb4e4af9b (patch) | |
| tree | a762e054dbc5893fc816f87a51d7515e9ef26e1b /ansible | |
| parent | c2dedab216658ac6307352b4a28f0c041ce176c3 (diff) | |
| parent | 54ce978461623f5b4a6953f28867474249015144 (diff) | |
| download | kolla-ansible-40cef82d85722bce09002f1490e2354fb4e4af9b.tar.gz kolla-ansible-40cef82d85722bce09002f1490e2354fb4e4af9b.zip | |
Merge "ansible-lint: Fix yaml[truthy] in nova role"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/nova-cell/defaults/main.yml | 10 | ||||
| -rw-r--r-- | ansible/roles/nova-cell/handlers/main.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/nova-cell/tasks/bootstrap_service.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/nova-cell/tasks/config-nova-fake.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/nova-cell/tasks/config.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/nova-cell/tasks/config_bootstrap.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/nova-cell/tasks/get_cell_settings.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/nova-cell/tasks/online_data_migrations.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/nova/defaults/main.yml | 8 | ||||
| -rw-r--r-- | ansible/roles/nova/tasks/bootstrap.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/nova/tasks/bootstrap_service.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/nova/tasks/config.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/nova/tasks/config_bootstrap.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/nova/tasks/online_data_migrations.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/nova/tasks/upgrade.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/service-rabbitmq/tasks/main.yml | 2 |
16 files changed, 31 insertions, 31 deletions
diff --git a/ansible/roles/nova-cell/defaults/main.yml b/ansible/roles/nova-cell/defaults/main.yml index 88f35ff73..1cc4a04aa 100644 --- a/ansible/roles/nova-cell/defaults/main.yml +++ b/ansible/roles/nova-cell/defaults/main.yml @@ -9,7 +9,7 @@ nova_cell_services: image: "{{ nova_libvirt_image_full }}" pid_mode: "host" cgroupns_mode: "host" - privileged: True + privileged: true volumes: "{{ nova_libvirt_default_volumes + nova_libvirt_extra_volumes + lookup('vars', 'run_default_volumes_' + kolla_container_engine) }}" dimensions: "{{ nova_libvirt_dimensions }}" healthcheck: "{{ nova_libvirt_healthcheck }}" @@ -47,7 +47,7 @@ nova_cell_services: nova-conductor: container_name: "nova_conductor" group: "{{ nova_cell_conductor_group }}" - enabled: True + enabled: true image: "{{ nova_conductor_image_full }}" volumes: "{{ nova_conductor_default_volumes + nova_conductor_extra_volumes }}" dimensions: "{{ nova_conductor_dimensions }}" @@ -58,7 +58,7 @@ nova_cell_services: image: "{{ nova_compute_image_full }}" environment: LIBGUESTFS_BACKEND: "direct" - privileged: True + privileged: true enabled: "{{ not enable_nova_fake | bool }}" ipc_mode: "host" volumes: "{{ nova_compute_default_volumes + nova_compute_extra_volumes + lookup('vars', 'run_default_volumes_' + kolla_container_engine) }}" @@ -307,7 +307,7 @@ nova_libvirt_default_dimensions: soft: 67108864 # 64 MiB hard: 67108864 # 64 MiB -nova_libvirt_dimensions: "{{ default_container_dimensions | combine(nova_libvirt_default_dimensions, recursive=True) }}" +nova_libvirt_dimensions: "{{ default_container_dimensions | combine(nova_libvirt_default_dimensions, recursive=true) }}" nova_ssh_dimensions: "{{ default_container_dimensions }}" nova_novncproxy_dimensions: "{{ default_container_dimensions }}" nova_spicehtml5proxy_dimensions: "{{ default_container_dimensions }}" @@ -583,7 +583,7 @@ qemu_max_files: 32768 qemu_max_processes: 131072 # Use TLS for libvirt connections and live migration libvirt_tls: false -# Should kolla-ansible manage/copy the certs. False, assumes the deployer is +# Should kolla-ansible manage/copy the certs. False, assumes the deployer is # responsible for making the TLS certs show up in the config directories # also means the deployer is responsible for restarting the nova_compute and # nova_libvirt containers when the key changes, as we can't know when to do that diff --git a/ansible/roles/nova-cell/handlers/main.yml b/ansible/roles/nova-cell/handlers/main.yml index 17658ef2e..2dcca1546 100644 --- a/ansible/roles/nova-cell/handlers/main.yml +++ b/ansible/roles/nova-cell/handlers/main.yml @@ -107,7 +107,7 @@ until: restart_nova_libvirt is success notify: "{{ nova_libvirt_notify }}" - # need to wait kolla_set_configs script to overwrite sasl config file +# need to wait kolla_set_configs script to overwrite sasl config file - name: Checking libvirt container is ready become: true shell: @@ -181,7 +181,7 @@ common_options: "{{ docker_common_options }}" name: "nova_compute_fake_{{ item }}" image: "{{ nova_compute_image_full }}" - privileged: True + privileged: true volumes: - "{{ node_config_directory }}/nova-compute-fake-{{ item }}/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" diff --git a/ansible/roles/nova-cell/tasks/bootstrap_service.yml b/ansible/roles/nova-cell/tasks/bootstrap_service.yml index e4a4d2b2c..a886211de 100644 --- a/ansible/roles/nova-cell/tasks/bootstrap_service.yml +++ b/ansible/roles/nova-cell/tasks/bootstrap_service.yml @@ -6,7 +6,7 @@ kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" - detach: False + detach: false environment: KOLLA_UPGRADE: KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" diff --git a/ansible/roles/nova-cell/tasks/config-nova-fake.yml b/ansible/roles/nova-cell/tasks/config-nova-fake.yml index 8959dfa14..45702ff01 100644 --- a/ansible/roles/nova-cell/tasks/config-nova-fake.yml +++ b/ansible/roles/nova-cell/tasks/config-nova-fake.yml @@ -38,7 +38,7 @@ become: true file: path: "{{ node_config_directory }}/nova-compute-fake-{{ item }}" - recurse: yes + recurse: true owner: "{{ config_owner_user }}" group: "{{ config_owner_group }}" with_sequence: start=1 end={{ num_nova_fake_per_node }} @@ -52,7 +52,7 @@ common_options: "{{ docker_common_options }}" name: "nova_compute_fake_{{ item }}" image: "{{ nova_compute_image_full }}" - privileged: True + privileged: true volumes: - "{{ node_config_directory }}/nova-compute-fake-{{ item }}/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" diff --git a/ansible/roles/nova-cell/tasks/config.yml b/ansible/roles/nova-cell/tasks/config.yml index 7783d5ee0..c2da1e528 100644 --- a/ansible/roles/nova-cell/tasks/config.yml +++ b/ansible/roles/nova-cell/tasks/config.yml @@ -22,7 +22,7 @@ stat: path: "{{ item }}" delegate_to: localhost - run_once: True + run_once: true register: nova_policy with_first_found: - files: "{{ supported_policy_format_list }}" @@ -41,7 +41,7 @@ stat: path: "{{ node_custom_config }}/nova/vendordata.json" delegate_to: localhost - run_once: True + run_once: true register: vendordata_file - name: Set vendordata file path @@ -184,7 +184,7 @@ src: "{{ vendordata_file_path }}" dest: "{{ node_config_directory }}/{{ item }}/vendordata.json" mode: "0660" - become: True + become: true when: - vendordata_file_path is defined - service | service_enabled_and_mapped_to_host diff --git a/ansible/roles/nova-cell/tasks/config_bootstrap.yml b/ansible/roles/nova-cell/tasks/config_bootstrap.yml index 59ce1eb9f..442320ecf 100644 --- a/ansible/roles/nova-cell/tasks/config_bootstrap.yml +++ b/ansible/roles/nova-cell/tasks/config_bootstrap.yml @@ -41,7 +41,7 @@ project_services: nova-cell-bootstrap: group: "{{ nova_cell_conductor_group }}" - enabled: True + enabled: true when: - nova_cell_copy_certs | bool - inventory_hostname == groups[nova_cell_conductor_group][0] diff --git a/ansible/roles/nova-cell/tasks/get_cell_settings.yml b/ansible/roles/nova-cell/tasks/get_cell_settings.yml index 301f3e403..30706663e 100644 --- a/ansible/roles/nova-cell/tasks/get_cell_settings.yml +++ b/ansible/roles/nova-cell/tasks/get_cell_settings.yml @@ -7,7 +7,7 @@ action: "start_container" command: bash -c 'sudo -E kolla_set_configs && sudo -E kolla_copy_cacerts && nova-manage cell_v2 list_cells --verbose' common_options: "{{ docker_common_options }}" - detach: False + detach: false image: "{{ nova_conductor.image }}" labels: BOOTSTRAP: diff --git a/ansible/roles/nova-cell/tasks/online_data_migrations.yml b/ansible/roles/nova-cell/tasks/online_data_migrations.yml index 9240c14e0..c9e0a0ccc 100644 --- a/ansible/roles/nova-cell/tasks/online_data_migrations.yml +++ b/ansible/roles/nova-cell/tasks/online_data_migrations.yml @@ -6,7 +6,7 @@ kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" - detach: False + detach: false environment: KOLLA_OSM: KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" diff --git a/ansible/roles/nova/defaults/main.yml b/ansible/roles/nova/defaults/main.yml index dec9d0614..9845b41b0 100644 --- a/ansible/roles/nova/defaults/main.yml +++ b/ansible/roles/nova/defaults/main.yml @@ -4,8 +4,8 @@ nova_services: container_name: "nova_api" group: "nova-api" image: "{{ nova_api_image_full }}" - enabled: True - privileged: True + enabled: true + privileged: true volumes: "{{ nova_api_default_volumes + nova_api_extra_volumes }}" dimensions: "{{ nova_api_dimensions }}" healthcheck: "{{ nova_api_healthcheck }}" @@ -34,7 +34,7 @@ nova_services: container_name: "nova_metadata" group: "nova-metadata" image: "{{ nova_api_image_full }}" - enabled: True + enabled: true volumes: "{{ nova_metadata_default_volumes + nova_metadata_extra_volumes }}" dimensions: "{{ nova_metadata_dimensions }}" healthcheck: "{{ nova_metadata_healthcheck }}" @@ -63,7 +63,7 @@ nova_services: container_name: "nova_scheduler" group: "nova-scheduler" image: "{{ nova_scheduler_image_full }}" - enabled: True + enabled: true volumes: "{{ nova_scheduler_default_volumes + nova_scheduler_extra_volumes }}" dimensions: "{{ nova_scheduler_dimensions }}" healthcheck: "{{ nova_scheduler_healthcheck }}" diff --git a/ansible/roles/nova/tasks/bootstrap.yml b/ansible/roles/nova/tasks/bootstrap.yml index cde4c04f2..53b65cb4a 100644 --- a/ansible/roles/nova/tasks/bootstrap.yml +++ b/ansible/roles/nova/tasks/bootstrap.yml @@ -11,7 +11,7 @@ login_user: "{{ nova_database_shard_root_user }}" login_password: "{{ database_password }}" name: "{{ item }}" - run_once: True + run_once: true with_items: - "{{ nova_cell0_database_name }}" - "{{ nova_api_database_name }}" @@ -43,7 +43,7 @@ database_password: "{{ nova_api_database_password }}" loop_control: label: "{{ item.database_name }}" - run_once: True + run_once: true when: - not use_preconfigured_databases | bool no_log: true diff --git a/ansible/roles/nova/tasks/bootstrap_service.yml b/ansible/roles/nova/tasks/bootstrap_service.yml index 0719ee96e..9ca46365e 100644 --- a/ansible/roles/nova/tasks/bootstrap_service.yml +++ b/ansible/roles/nova/tasks/bootstrap_service.yml @@ -6,7 +6,7 @@ kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" - detach: False + detach: false environment: KOLLA_UPGRADE: KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" diff --git a/ansible/roles/nova/tasks/config.yml b/ansible/roles/nova/tasks/config.yml index 6666d1a3e..8df855380 100644 --- a/ansible/roles/nova/tasks/config.yml +++ b/ansible/roles/nova/tasks/config.yml @@ -13,7 +13,7 @@ stat: path: "{{ item }}" delegate_to: localhost - run_once: True + run_once: true register: nova_policy with_first_found: - files: "{{ supported_policy_format_list }}" @@ -32,7 +32,7 @@ stat: path: "{{ node_custom_config }}/nova/vendordata.json" delegate_to: localhost - run_once: True + run_once: true register: vendordata_file - name: Set vendordata file path @@ -110,7 +110,7 @@ src: "{{ vendordata_file_path }}" dest: "{{ node_config_directory }}/{{ item }}/vendordata.json" mode: "0660" - become: True + become: true when: - vendordata_file_path is defined - service | service_enabled_and_mapped_to_host diff --git a/ansible/roles/nova/tasks/config_bootstrap.yml b/ansible/roles/nova/tasks/config_bootstrap.yml index aa62d437a..f6ecd4e75 100644 --- a/ansible/roles/nova/tasks/config_bootstrap.yml +++ b/ansible/roles/nova/tasks/config_bootstrap.yml @@ -18,7 +18,7 @@ project_services: nova-api-bootstrap: group: "nova-api" - enabled: True + enabled: true run_once: true when: - nova_copy_certs | bool diff --git a/ansible/roles/nova/tasks/online_data_migrations.yml b/ansible/roles/nova/tasks/online_data_migrations.yml index cd9f69baf..6a6b465a9 100644 --- a/ansible/roles/nova/tasks/online_data_migrations.yml +++ b/ansible/roles/nova/tasks/online_data_migrations.yml @@ -6,7 +6,7 @@ kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" - detach: False + detach: false environment: KOLLA_OSM: KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" diff --git a/ansible/roles/nova/tasks/upgrade.yml b/ansible/roles/nova/tasks/upgrade.yml index 538b548b7..005959c27 100644 --- a/ansible/roles/nova/tasks/upgrade.yml +++ b/ansible/roles/nova/tasks/upgrade.yml @@ -9,7 +9,7 @@ kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" - detach: False + detach: false environment: KOLLA_UPGRADE_CHECK: KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" @@ -19,7 +19,7 @@ name: "nova_upgrade_checks" restart_policy: oneshot volumes: "{{ nova_api_default_volumes + nova_api_extra_volumes }}" - run_once: True + run_once: true register: nova_upgrade_check_stdout delegate_to: "{{ groups['nova-api'][0] }}" failed_when: false diff --git a/ansible/roles/service-rabbitmq/tasks/main.yml b/ansible/roles/service-rabbitmq/tasks/main.yml index dcdc7d5da..415d988ef 100644 --- a/ansible/roles/service-rabbitmq/tasks/main.yml +++ b/ansible/roles/service-rabbitmq/tasks/main.yml @@ -41,4 +41,4 @@ until: service_rabbitmq_result is success retries: "{{ service_rabbitmq_retries }}" delay: "{{ service_rabbitmq_delay }}" - no_log: True + no_log: true |
