Merge "tripleo-container-manage: some improvements"
This commit is contained in:
commit
1e431d11f0
@ -20,7 +20,7 @@
|
|||||||
{{ podman_containers.containers | selectattr('Name', 'equalto', lookup('dict', container_exists_data).value.command.0) |
|
{{ podman_containers.containers | selectattr('Name', 'equalto', lookup('dict', container_exists_data).value.command.0) |
|
||||||
map(attribute='State.Running') | first | default(false) }}
|
map(attribute='State.Running') | first | default(false) }}
|
||||||
|
|
||||||
- name: "Fail if {{ lookup('dict', container_exists_data).key }} is not running"
|
- name: "Fail if {{ lookup('dict', container_exists_data).value.command.0 }} is not running"
|
||||||
fail:
|
fail:
|
||||||
msg: >-
|
msg: >-
|
||||||
Can't run container exec for {{ lookup('dict', container_exists_data).key }},
|
Can't run container exec for {{ lookup('dict', container_exists_data).key }},
|
||||||
|
@ -66,6 +66,7 @@
|
|||||||
- name: "Check podman create status"
|
- name: "Check podman create status"
|
||||||
async_status:
|
async_status:
|
||||||
jid: "{{ create_async_result_item.ansible_job_id }}"
|
jid: "{{ create_async_result_item.ansible_job_id }}"
|
||||||
|
no_log: "{{ not (tripleo_container_manage_debug | bool) }}"
|
||||||
loop: "{{ create_async_results.results }}"
|
loop: "{{ create_async_results.results }}"
|
||||||
loop_control:
|
loop_control:
|
||||||
loop_var: "create_async_result_item"
|
loop_var: "create_async_result_item"
|
||||||
|
@ -21,9 +21,10 @@
|
|||||||
loop_var: container_exists_data
|
loop_var: container_exists_data
|
||||||
when: not ansible_check_mode|bool
|
when: not ansible_check_mode|bool
|
||||||
|
|
||||||
- name: "Run actions async"
|
- name: "Async container exec"
|
||||||
command:
|
command:
|
||||||
argv: "{{ cmd_template + lookup('dict', container_exec_data).value.command }}"
|
argv: "{{ cmd_template + lookup('dict', container_exec_data).value.command }}"
|
||||||
|
no_log: "{{ not (tripleo_container_manage_debug | bool) }}"
|
||||||
vars:
|
vars:
|
||||||
cmd_template:
|
cmd_template:
|
||||||
- "{{ tripleo_container_manage_cli }}"
|
- "{{ tripleo_container_manage_cli }}"
|
||||||
@ -41,6 +42,7 @@
|
|||||||
- name: "Check podman exec status"
|
- name: "Check podman exec status"
|
||||||
async_status:
|
async_status:
|
||||||
jid: "{{ exec_async_result_item.ansible_job_id }}"
|
jid: "{{ exec_async_result_item.ansible_job_id }}"
|
||||||
|
no_log: "{{ not (tripleo_container_manage_debug | bool) }}"
|
||||||
loop: "{{ exec_async_results.results }}"
|
loop: "{{ exec_async_results.results }}"
|
||||||
loop_control:
|
loop_control:
|
||||||
loop_var: "exec_async_result_item"
|
loop_var: "exec_async_result_item"
|
||||||
|
@ -14,17 +14,6 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
- name: Check if /etc/sysconfig/podman_drop_in exists
|
|
||||||
stat:
|
|
||||||
path: /etc/sysconfig/podman_drop_in
|
|
||||||
register: podman_drop_in
|
|
||||||
|
|
||||||
- name: Set podman_drop_in fact
|
|
||||||
set_fact:
|
|
||||||
podman_drop_in: true
|
|
||||||
when:
|
|
||||||
- podman_drop_in.stat.exists
|
|
||||||
|
|
||||||
- name: Set container_name and container_sysd facts
|
- name: Set container_name and container_sysd facts
|
||||||
set_fact:
|
set_fact:
|
||||||
container_sysd_name: "{{ lookup('dict', container_config).key }}"
|
container_sysd_name: "{{ lookup('dict', container_config).key }}"
|
||||||
|
@ -14,6 +14,17 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
- name: Check if /etc/sysconfig/podman_drop_in exists
|
||||||
|
stat:
|
||||||
|
path: /etc/sysconfig/podman_drop_in
|
||||||
|
register: podman_drop_in
|
||||||
|
|
||||||
|
- name: Set podman_drop_in fact
|
||||||
|
set_fact:
|
||||||
|
podman_drop_in: true
|
||||||
|
when:
|
||||||
|
- podman_drop_in.stat.exists
|
||||||
|
|
||||||
- name: Cleanup Paunch services and files
|
- name: Cleanup Paunch services and files
|
||||||
block:
|
block:
|
||||||
- name: Check if /usr/lib/systemd/system/paunch-container-shutdown.service exists
|
- name: Check if /usr/lib/systemd/system/paunch-container-shutdown.service exists
|
||||||
@ -51,7 +62,7 @@
|
|||||||
|
|
||||||
- name: Create TripleO Container systemd service
|
- name: Create TripleO Container systemd service
|
||||||
block:
|
block:
|
||||||
- name: "Create /usr/libexec/{{ item }}"
|
- name: "Deploy tripleo-container-shutdown and tripleo-start-podman-container"
|
||||||
copy:
|
copy:
|
||||||
src: "{{ role_path }}/files/{{ item }}"
|
src: "{{ role_path }}/files/{{ item }}"
|
||||||
dest: "/usr/libexec/{{ item }}"
|
dest: "/usr/libexec/{{ item }}"
|
||||||
|
Loading…
Reference in New Issue
Block a user