Synchronise master with upstream

.ansible-lint

@@ -31,14 +31,11 @@ skip_list:
   # role name check matching ^*$
   - role-name
   # TODO(frickler): Discuss these in detail, skipping for now to unblock things
-  - key-order[task]
-  - no-free-form
   - name[play]
   - var-naming[no-role-prefix]
   - risky-file-permissions
   - risky-shell-pipe
   - command-instead-of-shell
   - command-instead-of-module
-  - ignore-errors
   - yaml[truthy]
   - yaml[line-length]

ansible/inventory/all-in-one

@@ -130,7 +130,6 @@ control
 
 [cyborg:children]
 control
-compute
 
 [tacker:children]
 control

ansible/inventory/multinode

@@ -145,7 +145,6 @@ control
 
 [cyborg:children]
 control
-compute
 
 [gnocchi:children]
 control

ansible/roles/aodh/tasks/bootstrap.yml

@@ -11,7 +11,7 @@
       login_user: "{{ aodh_database_shard_root_user }}"
       login_password: "{{ database_password }}"
       name: "{{ aodh_database_name }}"
-  run_once: True
+  run_once: true
   delegate_to: "{{ groups['aodh-api'][0] }}"
   when:
     - not use_preconfigured_databases | bool
@@ -32,7 +32,7 @@
       host: "%"
       priv: "{{ aodh_database_name }}.*:ALL"
       append_privs: "yes"
-  run_once: True
+  run_once: true
   delegate_to: "{{ groups['aodh-api'][0] }}"
   when:
     - not use_preconfigured_databases | bool

ansible/roles/aodh/tasks/bootstrap_service.yml

@@ -6,7 +6,7 @@
   kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
-    detach: False
+    detach: false
     environment:
       KOLLA_BOOTSTRAP:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
@@ -16,5 +16,5 @@
     name: "bootstrap_aodh"
     restart_policy: oneshot
     volumes: "{{ aodh_api.volumes | reject('equalto', '') | list }}"
-  run_once: True
+  run_once: true
   delegate_to: "{{ groups[aodh_api.group][0] }}"

ansible/roles/aodh/tasks/config.yml

@@ -12,7 +12,7 @@
 - name: Check if policies shall be overwritten
   stat:
     path: "{{ item }}"
-  run_once: True
+  run_once: true
   delegate_to: localhost
   register: aodh_policy
   with_first_found:

ansible/roles/barbican/tasks/bootstrap.yml

@@ -11,7 +11,7 @@
       login_user: "{{ barbican_database_shard_root_user }}"
       login_password: "{{ database_password }}"
       name: "{{ barbican_database_name }}"
-  run_once: True
+  run_once: true
   delegate_to: "{{ groups['barbican-api'][0] }}"
   when:
     - not use_preconfigured_databases | bool
@@ -32,7 +32,7 @@
       host: "%"
       priv: "{{ barbican_database_name }}.*:ALL"
       append_privs: "yes"
-  run_once: True
+  run_once: true
   delegate_to: "{{ groups['barbican-api'][0] }}"
   when:
     - not use_preconfigured_databases | bool

ansible/roles/barbican/tasks/bootstrap_service.yml

@@ -6,7 +6,7 @@
   kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
-    detach: False
+    detach: false
     environment:
       KOLLA_BOOTSTRAP:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
@@ -16,5 +16,5 @@
     name: "bootstrap_barbican"
     restart_policy: oneshot
     volumes: "{{ barbican_api.volumes | reject('equalto', '') | list }}"
-  run_once: True
+  run_once: true
   delegate_to: "{{ groups[barbican_api.group][0] }}"

ansible/roles/barbican/tasks/config.yml

@@ -26,7 +26,7 @@
 - name: Check if policies shall be overwritten
   stat:
     path: "{{ item }}"
-  run_once: True
+  run_once: true
   delegate_to: localhost
   register: barbican_policy
   with_first_found:
@@ -72,7 +72,7 @@
     service: "{{ barbican_services['barbican-api'] }}"
   stat:
     path: "{{ node_custom_config }}/barbican/barbican-api-paste.ini"
-  run_once: True
+  run_once: true
   delegate_to: localhost
   register: check_barbican_api_paste_ini
   when: service | service_enabled_and_mapped_to_host

ansible/roles/bifrost/tasks/start.yml

@@ -6,7 +6,7 @@
     common_options: "{{ docker_common_options }}"
     image: "{{ bifrost_deploy_image_full }}"
     name: "bifrost_deploy"
-    privileged: True
+    privileged: true
     environment: "{{ bifrost_deploy_container_proxy }}"
     volumes:
       - "{{ node_config_directory }}/bifrost/:/etc/bifrost:ro"

ansible/roles/bifrost/tasks/stop.yml

@@ -1,5 +1,8 @@
 ---
-- block:
+- when:
+    - inventory_hostname in groups['bifrost']
+    - "'bifrost_deploy' not in skip_stop_containers"
+  block:
     - name: Check if bifrost_deploy container is running
       become: true
       kolla_container_facts:
@@ -9,7 +12,8 @@
           - bifrost_deploy
       register: container_facts
 
-    - block:
+    - when: container_facts.containers['bifrost_deploy'] is defined
+      block:
         # Ensure that all services are stopped gracefully, and in a sensible
         # order.
         - name: Stop services gracefully
@@ -26,9 +30,3 @@
             action: "stop_container"
             common_options: "{{ docker_common_options }}"
             name: "bifrost_deploy"
-
-      when: "container_facts.containers['bifrost_deploy'] is defined"
-
-  when:
-    - inventory_hostname in groups['bifrost']
-    - "'bifrost_deploy' not in skip_stop_containers"

ansible/roles/blazar/tasks/bootstrap.yml

@@ -11,7 +11,7 @@
       login_user: "{{ blazar_database_shard_root_user }}"
       login_password: "{{ database_password }}"
       name: "{{ blazar_database_name }}"
-  run_once: True
+  run_once: true
   delegate_to: "{{ groups['blazar-api'][0] }}"
   when:
     - not use_preconfigured_databases | bool
@@ -32,7 +32,7 @@
       host: "%"
       priv: "{{ blazar_database_name }}.*:ALL"
       append_privs: "yes"
-  run_once: True
+  run_once: true
   delegate_to: "{{ groups['blazar-api'][0] }}"
   when:
     - not use_preconfigured_databases | bool
@@ -48,7 +48,7 @@
       endpoint_type: "{{ openstack_interface }}"
       region_name: "{{ openstack_region_name }}"
       name: "{{ blazar_aggregate_pool_name }}"
-  run_once: True
+  run_once: true
   delegate_to: "{{ groups['blazar-api'][0] }}"
 
 - import_tasks: bootstrap_service.yml

ansible/roles/blazar/tasks/bootstrap_service.yml

@@ -6,7 +6,7 @@
   kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
-    detach: False
+    detach: false
     environment:
       KOLLA_BOOTSTRAP:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
@@ -16,5 +16,5 @@
     name: "bootstrap_blazar"
     restart_policy: oneshot
     volumes: "{{ blazar_api.volumes | reject('equalto', '') | list }}"
-  run_once: True
+  run_once: true
   delegate_to: "{{ groups[blazar_api.group][0] }}"

ansible/roles/blazar/tasks/config.yml

@@ -12,7 +12,7 @@
 - name: Check if policies shall be overwritten
   stat:
     path: "{{ item }}"
-  run_once: True
+  run_once: true
   delegate_to: localhost
   register: blazar_policy
   with_first_found:

ansible/roles/ceilometer/defaults/main.yml

@@ -3,24 +3,24 @@ ceilometer_services:
   ceilometer-notification:
     container_name: ceilometer_notification
     group: ceilometer-notification
-    enabled: True
+    enabled: true
     image: "{{ ceilometer_notification_image_full }}"
     volumes: "{{ ceilometer_notification_default_volumes + ceilometer_notification_extra_volumes }}"
     dimensions: "{{ ceilometer_notification_dimensions }}"
     healthcheck: "{{ ceilometer_notification_healthcheck }}"
   ceilometer-central:
     container_name: ceilometer_central
     group: ceilometer-central
-    enabled: True
+    enabled: true
     image: "{{ ceilometer_central_image_full }}"
     volumes: "{{ ceilometer_central_default_volumes + ceilometer_central_extra_volumes }}"
     dimensions: "{{ ceilometer_central_dimensions }}"
     healthcheck: "{{ ceilometer_central_healthcheck }}"
   ceilometer-compute:
     container_name: ceilometer_compute
     group: ceilometer-compute
-    enabled: True
-    privileged: True
+    enabled: true
+    privileged: true
     image: "{{ ceilometer_compute_image_full }}"
     volumes: "{{ ceilometer_compute_default_volumes + ceilometer_compute_extra_volumes + lookup('vars', 'run_default_volumes_' + kolla_container_engine) }}"
     dimensions: "{{ ceilometer_compute_dimensions }}"

ansible/roles/ceilometer/tasks/bootstrap_service.yml

@@ -6,7 +6,7 @@
   kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
-    detach: False
+    detach: false
     environment:
       KOLLA_BOOTSTRAP:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
@@ -18,5 +18,5 @@
     name: "bootstrap_ceilometer"
     restart_policy: oneshot
     volumes: "{{ ceilometer_notification.volumes | reject('equalto', '') | list }}"
-  run_once: True
+  run_once: true
   delegate_to: "{{ groups[ceilometer_notification.group][0] }}"

ansible/roles/ceilometer/tasks/config.yml

@@ -47,7 +47,7 @@
   copy:
     src: "{{ node_custom_config }}/ceilometer/{{ ceilometer_custom_meters_local_folder }}/"
     dest: "{{ node_config_directory }}/{{ item.key }}/meters.d"
-    force: True
+    force: true
     mode: "0660"
   become: true
   when:
@@ -59,7 +59,7 @@
     path: "{{ node_custom_config }}/ceilometer/{{ ceilometer_dynamic_pollsters_local_folder }}"
   delegate_to: localhost
   register: ceilometer_dynamic_pollsters_folder
-  run_once: True
+  run_once: true
 
 - name: Set the variable that control the copy of dynamic pollsters definitions
   set_fact:
@@ -102,7 +102,7 @@
   copy:
     src: "{{ node_custom_config }}/ceilometer/polling.yaml"
     dest: "{{ node_config_directory }}/{{ item.key }}/polling.yaml"
-    force: True
+    force: true
     mode: "0660"
   become: true
   when:
@@ -125,7 +125,7 @@
   copy:
     src: "{{ node_custom_config }}/ceilometer/gnocchi_resources.yaml"
     dest: "{{ node_config_directory }}/{{ item.key }}/gnocchi_resources.yaml"
-    force: True
+    force: true
     mode: "0660"
   become: true
   when:
@@ -142,7 +142,7 @@
   stat:
     path: "{{ item }}"
   delegate_to: localhost
-  run_once: True
+  run_once: true
   register: ceilometer_policy
   with_first_found:
     - files: "{{ supported_policy_format_list }}"
@@ -196,7 +196,7 @@
   copy:
     src: "{{ node_custom_config }}/ceilometer/event_definitions.yaml"
     dest: "{{ node_config_directory }}/ceilometer-notification/event_definitions.yaml"
-    force: True
+    force: true
     mode: "0660"
   become: true
   register: ceilometer_event_definitions_overwriting
@@ -245,7 +245,7 @@
   template:
     src: "{{ node_custom_config }}/ceilometer/pipeline.yaml"
     dest: "{{ node_config_directory }}/{{ item.key }}/pipeline.yaml"
-    force: True
+    force: true
     mode: "0660"
   become: true
   register: ceilometer_pipeline_overwriting

ansible/roles/ceilometer/tasks/precheck.yml

@@ -10,5 +10,5 @@
     that:
       - not (enable_ceilometer | bool) or enable_gnocchi | bool or enable_ceilometer_prometheus_pushgateway | bool
     msg: "At least one Ceilometer publisher must be enabled"
-  run_once: True
+  run_once: true
   changed_when: false