Merge "tripleo_container_manage: extract get_commands into playbooks"

tripleo_ansible/roles/tripleo_container_manage/tasks/podman/create.yml

@@ -103,20 +103,9 @@
     - containers_failed|length != 0
 
 - name: Block for container commands
+  include_tasks: podman/get_commands_create.yml
   when:
     - ansible_check_mode|bool
-  block:
-    - name: "Create a list of podman commands that are run for containers with changes"
-      set_fact:
-        containers_commands: >-
-          {{ create_async_results.results | selectattr('changed', 'equalto', true) |
-          map(attribute='podman_actions') | default([]) | list }}
-    - name: "Print the list of commands that are run for containers with changes"
-      debug:
-        var: containers_commands
-    - name: "Append the list of all podman commands that are run for containers with changes"
-      set_fact:
-        all_containers_commands: "{{ containers_commands|default([], true) + (all_containers_commands | default([]) | list) }}"
 
 - name: "Print the list of containers which changed"
   debug:

tripleo_ansible/roles/tripleo_container_manage/tasks/podman/exec.yml

@@ -46,21 +46,6 @@
   when: not ansible_check_mode|bool
 
 - name: Block for container commands
+  include_tasks: podman/get_commands_exec.yml
   when:
     - ansible_check_mode|bool
-  block:
-    - name: "Create a list of podman exec commands that are run"
-      no_log: "{{ not tripleo_container_manage_debug }}"
-      set_fact:
-        containers_commands: >-
-          {{ (containers_commands | default([])) + ([lookup('dict', container_exec_data).value |
-          container_exec_cmd(cli=tripleo_container_manage_cli) | join(' ')]) }}
-      loop: "{{ batched_container_data | haskey(attribute='action', value='exec') }}"
-      loop_control:
-        loop_var: container_exec_data
-    - name: "Print the list of podman exec commands that are run"
-      debug:
-        var: containers_commands
-    - name: "Append the list of all podman commands that are run for containers with changes"
-      set_fact:
-        all_containers_commands: "{{ containers_commands|default([], true) + (all_containers_commands | default([]) | list) }}"

tripleo_ansible/roles/tripleo_container_manage/tasks/podman/get_commands_create.yml

@@ -0,0 +1,29 @@
+---
+# Copyright 2020 Red Hat, Inc.
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+- name: "Create a list of podman commands that are run for containers with changes"
+  set_fact:
+    containers_commands: >-
+      {{ create_async_results.results | selectattr('changed', 'equalto', true) |
+      map(attribute='podman_actions') | default([]) | list }}
+
+- name: "Print the list of commands that are run for containers with changes"
+  debug:
+    var: containers_commands
+
+- name: "Append the list of all podman commands that are run for containers with changes"
+  set_fact:
+    all_containers_commands: "{{ containers_commands|default([], true) + (all_containers_commands | default([]) | list) }}"

tripleo_ansible/roles/tripleo_container_manage/tasks/podman/get_commands_exec.yml

@@ -0,0 +1,33 @@
+---
+# Copyright 2020 Red Hat, Inc.
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+- name: "Create a list of podman exec commands that are run"
+  no_log: "{{ not tripleo_container_manage_debug }}"
+  set_fact:
+    containers_commands: >-
+      {{ (containers_commands | default([])) + ([lookup('dict', container_exec_data).value |
+      container_exec_cmd(cli=tripleo_container_manage_cli) | join(' ')]) }}
+  loop: "{{ batched_container_data | haskey(attribute='action', value='exec') }}"
+  loop_control:
+    loop_var: container_exec_data
+
+- name: "Print the list of podman exec commands that are run"
+  debug:
+    var: containers_commands
+
+- name: "Append the list of all podman commands that are run for containers with changes"
+  set_fact:
+    all_containers_commands: "{{ containers_commands|default([], true) + (all_containers_commands | default([]) | list) }}"