diff --git a/molecule/common/test_deps/defaults/main.yml b/molecule/common/test_deps/defaults/main.yml index 8fb2470f2..e0378dfd6 100644 --- a/molecule/common/test_deps/defaults/main.yml +++ b/molecule/common/test_deps/defaults/main.yml @@ -20,3 +20,5 @@ test_deps_setup_edpm: false test_deps_mirrors_file_path: /etc/ci/mirror_info.sh test_deps_setup_stream: true test_deps_setup_ceph: false +# Value to use for the bootc fact +test_deps_bootc_fact: false diff --git a/molecule/common/test_deps/tasks/main.yml b/molecule/common/test_deps/tasks/main.yml index 485f1f94a..137a41cf8 100644 --- a/molecule/common/test_deps/tasks/main.yml +++ b/molecule/common/test_deps/tasks/main.yml @@ -152,3 +152,29 @@ releasever: "{{ ansible_facts['distribution_major_version'] }}" when: - (test_deps_extra_packages | length) > 0 + +- name: Bootc block + become: true + block: + - name: Check for /etc/ansible/facts.d/bootc.fact + stat: + path: /etc/ansible/facts.d/bootc.fact + register: bootc_fact_stat + + - name: Create /etc/ansible/facts.d + file: + state: directory + path: /etc/ansible/facts.d + + - name: Create /etc/ansible/facts.d/bootc.fact + copy: + dest: /etc/ansible/facts.d/bootc.fact + content: | + #!/bin/bash + echo "{{ test_deps_bootc_fact | lower }}" + mode: 0755 + + - name: Gather local facts + ansible.builtin.setup: + gather_subset: + - "local" diff --git a/playbooks/bootstrap.yml b/playbooks/bootstrap.yml index c8948766c..3fa905692 100644 --- a/playbooks/bootstrap.yml +++ b/playbooks/bootstrap.yml @@ -42,6 +42,7 @@ name: osp.edpm.edpm_kernel tags: - edpm_kernel + when: not ansible_local.bootc - name: Import edpm_tuned ansible.builtin.import_role: name: osp.edpm.edpm_tuned @@ -53,9 +54,11 @@ tasks_from: kernelargs.yml tags: - edpm_kernel + when: not ansible_local.bootc - name: Configure KSM for kernel ansible.builtin.import_role: name: osp.edpm.edpm_kernel tasks_from: ksm.yml tags: - edpm_kernel + when: not ansible_local.bootc diff --git a/roles/edpm_bootstrap/tasks/bootstrap.yml b/roles/edpm_bootstrap/tasks/bootstrap.yml index d10a02684..b9aa3f0ab 100644 --- a/roles/edpm_bootstrap/tasks/bootstrap.yml +++ b/roles/edpm_bootstrap/tasks/bootstrap.yml @@ -60,8 +60,9 @@ - name: Execute bootstrap command ansible.builtin.import_tasks: bootstrap_command.yml -- name: Import packages tasks - ansible.builtin.import_tasks: packages.yml +- name: Include packages tasks + ansible.builtin.include_tasks: packages.yml + when: not ansible_local.bootc - name: Set selinux state ansible.posix.selinux: @@ -107,8 +108,9 @@ #!/bin/sh make_resolv_conf() { : ; } -- name: Configure swap - ansible.builtin.import_tasks: swap.yml +- name: Include swap tasks + ansible.builtin.include_tasks: swap.yml + when: not ansible_local.bootc - name: FIPS tasks ansible.builtin.import_tasks: fips.yml diff --git a/roles/edpm_bootstrap/tasks/packages.yml b/roles/edpm_bootstrap/tasks/packages.yml index 836659c82..e89f8ccdb 100644 --- a/roles/edpm_bootstrap/tasks/packages.yml +++ b/roles/edpm_bootstrap/tasks/packages.yml @@ -65,6 +65,7 @@ - name: Install and enable network service when: - (edpm_bootstrap_legacy_network_packages | length) > 0 + - not ansible_local.bootc become: true block: - name: Deploy network-scripts required for deprecated network service diff --git a/roles/edpm_bootstrap/tasks/swap.yml b/roles/edpm_bootstrap/tasks/swap.yml index 2ce1c8522..f2053e7cc 100644 --- a/roles/edpm_bootstrap/tasks/swap.yml +++ b/roles/edpm_bootstrap/tasks/swap.yml @@ -16,6 +16,7 @@ - name: Configure swap file when: + - not ansible_local.bootc - not edpm_bootstrap_swap_partition_enabled|bool - edpm_bootstrap_swap_size_megabytes|int > 0 become: true diff --git a/roles/edpm_container_manage/files/edpm-container-shutdown-service b/roles/edpm_container_manage/files/edpm-container-shutdown-service index 7ab64b2db..150dd7c58 100644 --- a/roles/edpm_container_manage/files/edpm-container-shutdown-service +++ b/roles/edpm_container_manage/files/edpm-container-shutdown-service @@ -11,7 +11,7 @@ RefuseManualStop=yes Type=oneshot ExecStart=/bin/true RemainAfterExit=yes -ExecStop=/usr/libexec/edpm-container-shutdown +ExecStop=/var/local/libexec/edpm-container-shutdown # Wait at most 900 seconds for all containers to shutdown TimeoutStopSec=900 diff --git a/roles/edpm_container_manage/tasks/shutdown.yml b/roles/edpm_container_manage/tasks/shutdown.yml index 6d840b3fc..cec993714 100644 --- a/roles/edpm_container_manage/tasks/shutdown.yml +++ b/roles/edpm_container_manage/tasks/shutdown.yml @@ -17,27 +17,42 @@ - name: Create EDPM Container systemd service become: true block: + - name: "Create /var/local/libexec dir" + file: + state: directory + path: /var/local/libexec + recurse: true + setype: container_file_t + - name: "Deploy edpm-container-shutdown and edpm-start-podman-container" ansible.builtin.copy: src: "{{ role_path }}/files/{{ item }}" - dest: "/usr/libexec/{{ item }}" + dest: "/var/local/libexec/{{ item }}" mode: '0700' owner: root group: root + setype: container_file_t loop: - 'edpm-container-shutdown' - 'edpm-start-podman-container' - - name: "Create /usr/lib/systemd/system/edpm-container-shutdown.service" + + - name: "Create systemd preset dir" + ansible.builtin.file: + state: "directory" + path: "/etc/systemd/system-preset" + mode: 0644 + + - name: "Create /etc/systemd/system/edpm-container-shutdown.service" ansible.builtin.copy: src: "{{ role_path }}/files/edpm-container-shutdown-service" - dest: "/usr/lib/systemd/system/edpm-container-shutdown.service" + dest: "/etc/systemd/system/edpm-container-shutdown.service" mode: '0644' owner: root group: root - - name: "Create /usr/lib/systemd/system-preset/91-edpm-container-shutdown.preset" + - name: "Create /etc/systemd/system-preset/91-edpm-container-shutdown.preset" ansible.builtin.copy: src: "{{ role_path }}/files/91-edpm-container-shutdown-preset" - dest: "/usr/lib/systemd/system-preset/91-edpm-container-shutdown.preset" + dest: "/etc/systemd/system-preset/91-edpm-container-shutdown.preset" mode: '0644' owner: root group: root @@ -47,17 +62,17 @@ state: started enabled: true daemon_reload: true - - name: "Create /usr/lib/systemd/system/netns-placeholder.service" + - name: "Create /etc/systemd/system/netns-placeholder.service" ansible.builtin.copy: src: "{{ role_path }}/files/netns-placeholder-service" - dest: "/usr/lib/systemd/system/netns-placeholder.service" + dest: "/etc/systemd/system/netns-placeholder.service" mode: '0644' owner: root group: root - - name: "Create /usr/lib/systemd/system-preset/91-netns-placeholder.preset" + - name: "Create /etc/systemd/system-preset/91-netns-placeholder.preset" ansible.builtin.copy: src: "{{ role_path }}/files/91-netns-placeholder-preset" - dest: "/usr/lib/systemd/system-preset/91-netns-placeholder.preset" + dest: "/etc/systemd/system-preset/91-netns-placeholder.preset" mode: '0644' owner: root group: root diff --git a/roles/edpm_container_manage/templates/systemd-service.j2 b/roles/edpm_container_manage/templates/systemd-service.j2 index e8b0aeecb..2ed10ecc8 100644 --- a/roles/edpm_container_manage/templates/systemd-service.j2 +++ b/roles/edpm_container_manage/templates/systemd-service.j2 @@ -8,7 +8,7 @@ Wants={{ lookup('dict', container_data_unit).value.depends_on | default([]) | jo [Service] Restart=always {% if lookup('dict', container_data_unit).value.depends_on is defined and (lookup('dict', container_data_unit).value.depends_on | length > 0) and podman_drop_in | default('false') %} -ExecStart=/usr/libexec/edpm-start-podman-container {{ lookup('dict', container_data_unit).key }} +ExecStart=/var/local/libexec/edpm-start-podman-container {{ lookup('dict', container_data_unit).key }} {% else %} ExecStart=/usr/bin/podman start {{ lookup('dict', container_data_unit).key }} {% endif %} diff --git a/roles/edpm_frr/tasks/run.yml b/roles/edpm_frr/tasks/run.yml index 9cf409fe9..a90786358 100644 --- a/roles/edpm_frr/tasks/run.yml +++ b/roles/edpm_frr/tasks/run.yml @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -- name: Ensure /usr/libexec/edpm-start-podman-container exists +- name: Ensure /var/local/libexec/edpm-start-podman-container exists ansible.builtin.import_role: name: edpm_container_manage tasks_from: shutdown.yml diff --git a/roles/edpm_iscsid/tasks/run.yml b/roles/edpm_iscsid/tasks/run.yml index 4ad60cbe1..417309538 100644 --- a/roles/edpm_iscsid/tasks/run.yml +++ b/roles/edpm_iscsid/tasks/run.yml @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -- name: Ensure /usr/libexec/edpm-start-podman-container exists +- name: Ensure /var/local/libexec/edpm-start-podman-container exists ansible.builtin.import_role: name: edpm_container_manage tasks_from: shutdown.yml diff --git a/roles/edpm_kernel/tasks/main.yml b/roles/edpm_kernel/tasks/main.yml index 8a70e7ef0..da2266450 100644 --- a/roles/edpm_kernel/tasks/main.yml +++ b/roles/edpm_kernel/tasks/main.yml @@ -25,7 +25,9 @@ name: "{{ edpm_kernel_extra_packages }}" state: present register: _install_packages_result - when: edpm_kernel_extra_packages | length > 0 + when: + - edpm_kernel_extra_packages | length > 0 + - not ansible_local.bootc until: _install_packages_result is succeeded retries: "{{ edpm_kernel_download_retries }}" delay: "{{ edpm_kernel_download_delay }}" @@ -34,6 +36,7 @@ ansible.builtin.dnf: name: 'dracut-config-generic' state: absent + when: not ansible_local.bootc - name: Ensure the /etc/modules-load.d/ directory exists ansible.builtin.file: diff --git a/roles/edpm_libvirt/tasks/install.yml b/roles/edpm_libvirt/tasks/install.yml index 799ef6e57..a936bfed6 100644 --- a/roles/edpm_libvirt/tasks/install.yml +++ b/roles/edpm_libvirt/tasks/install.yml @@ -13,6 +13,7 @@ delay: "{{ edpm_libvirt_download_delay }}" notify: - Restart libvirt + when: not ansible_local.bootc - name: Ensure monolithic libvirt and tcp socket activation is not enabled or running tags: diff --git a/roles/edpm_logrotate_crond/molecule/default/converge.yml b/roles/edpm_logrotate_crond/molecule/default/converge.yml index 312986570..3b2315dba 100644 --- a/roles/edpm_logrotate_crond/molecule/default/converge.yml +++ b/roles/edpm_logrotate_crond/molecule/default/converge.yml @@ -19,6 +19,7 @@ hosts: all gather_facts: false tasks: + - name: install edpm_logrotate_crond include_role: name: "osp.edpm.edpm_logrotate_crond" diff --git a/roles/edpm_logrotate_crond/molecule/default/verify.yml b/roles/edpm_logrotate_crond/molecule/default/verify.yml index b041dfdb9..d806f6dbc 100644 --- a/roles/edpm_logrotate_crond/molecule/default/verify.yml +++ b/roles/edpm_logrotate_crond/molecule/default/verify.yml @@ -23,7 +23,7 @@ - name: Push script ansible.builtin.stat: - path: /usr/local/sbin/containers-tmpwatch + path: /var/lib/openstack/cron/containers-tmpwatch register: stat_result failed_when: not stat_result.stat.exists @@ -31,7 +31,7 @@ ansible.builtin.shell: crontab -l register: crontab - failed_when: "'@daily /usr/local/sbin/containers-tmpwatch' not in crontab.stdout" + failed_when: "'@daily /var/lib/openstack/cron/containers-tmpwatch' not in crontab.stdout" - name: Ensure config directories exist ansible.builtin.stat: diff --git a/roles/edpm_logrotate_crond/tasks/configure.yml b/roles/edpm_logrotate_crond/tasks/configure.yml index a7b45af01..f381b5ab3 100644 --- a/roles/edpm_logrotate_crond/tasks/configure.yml +++ b/roles/edpm_logrotate_crond/tasks/configure.yml @@ -17,9 +17,23 @@ - name: Configure tmpwatch on the host become: true block: + - name: Create /var/lib/openstack + ansible.builtin.file: + path: "/var/lib/openstack" + mode: 0755 + state: directory + setype: "container_file_t" + + - name: Create /var/lib/openstack/cron + ansible.builtin.file: + path: "/var/lib/openstack/cron" + mode: 0644 + state: directory + setype: "container_file_t" + - name: Push script ansible.builtin.copy: - dest: /usr/local/sbin/containers-tmpwatch + dest: /var/lib/openstack/cron/containers-tmpwatch owner: root group: root mode: "0755" @@ -36,7 +50,7 @@ name: "Remove old logs" special_time: "daily" user: "root" - job: "/usr/local/sbin/containers-tmpwatch" + job: "/var/lib/openstack/cron/containers-tmpwatch" - name: Configure logrotate_crond become: true diff --git a/roles/edpm_logrotate_crond/tasks/install.yml b/roles/edpm_logrotate_crond/tasks/install.yml index 1990cc994..1c73c7d08 100644 --- a/roles/edpm_logrotate_crond/tasks/install.yml +++ b/roles/edpm_logrotate_crond/tasks/install.yml @@ -14,6 +14,14 @@ # License for the specific language governing permissions and limitations # under the License. + +- name: Gather local facts + ansible.builtin.setup: + gather_subset: + - "!all" + - "!min" + - "local" + - name: Install cronie become: true ansible.builtin.dnf: @@ -23,6 +31,7 @@ until: edpm_logrotate_crond_cronie_package_download is succeeded retries: "{{ edpm_logrotate_crond_download_retries }}" delay: "{{ edpm_logrotate_crond_download_delay }}" + when: not ansible_local.bootc - name: Gather SELinux fact if needed when: diff --git a/roles/edpm_multipathd/tasks/run.yml b/roles/edpm_multipathd/tasks/run.yml index 42988f15a..4d7e7214f 100644 --- a/roles/edpm_multipathd/tasks/run.yml +++ b/roles/edpm_multipathd/tasks/run.yml @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -- name: Ensure /usr/libexec/edpm-start-podman-container exists +- name: Ensure /var/local/libexec/edpm-start-podman-container exists ansible.builtin.import_role: name: edpm_container_manage tasks_from: shutdown.yml diff --git a/roles/edpm_network_config/tasks/main.yml b/roles/edpm_network_config/tasks/main.yml index 1d024cd8a..0dcea7a7f 100644 --- a/roles/edpm_network_config/tasks/main.yml +++ b/roles/edpm_network_config/tasks/main.yml @@ -35,6 +35,7 @@ until: nm_ovs_status is succeeded retries: "{{ edpm_network_config_download_retries }}" delay: "{{ edpm_network_config_download_delay }}" + when: not ansible_local.bootc - name: Restart NetworkManager after plugin installation [nmstate] ansible.builtin.systemd: name: NetworkManager diff --git a/roles/edpm_network_config/tasks/network_config.yml b/roles/edpm_network_config/tasks/network_config.yml index db8913d7a..5992a207c 100644 --- a/roles/edpm_network_config/tasks/network_config.yml +++ b/roles/edpm_network_config/tasks/network_config.yml @@ -47,6 +47,7 @@ until: edpm_network_config_onc_download is succeeded retries: "{{ edpm_network_config_download_retries }}" delay: "{{ edpm_network_config_download_delay }}" + when: not ansible_local.bootc - name: Ensure /var/lib/edpm-config directory exists become: true diff --git a/roles/edpm_neutron_dhcp/tasks/run.yml b/roles/edpm_neutron_dhcp/tasks/run.yml index ae0760fb2..4b3d36e16 100644 --- a/roles/edpm_neutron_dhcp/tasks/run.yml +++ b/roles/edpm_neutron_dhcp/tasks/run.yml @@ -27,7 +27,7 @@ - "{{ edpm_neutron_dhcp_tls_cacert_bundle_src }}:{{ edpm_neutron_dhcp_tls_cacert_bundle_dest }}:ro,z" when: cacert_bundle_exists.stat.exists -- name: Ensure /usr/libexec/edpm-start-podman-container exists +- name: Ensure /var/local/libexec/edpm-start-podman-container exists ansible.builtin.import_role: name: edpm_container_manage tasks_from: shutdown.yml diff --git a/roles/edpm_neutron_metadata/tasks/run.yml b/roles/edpm_neutron_metadata/tasks/run.yml index bc46b251d..565d9271d 100644 --- a/roles/edpm_neutron_metadata/tasks/run.yml +++ b/roles/edpm_neutron_metadata/tasks/run.yml @@ -27,7 +27,7 @@ - "{{ edpm_neutron_metadata_tls_cacert_bundle_src }}:{{ edpm_neutron_metadata_tls_cacert_bundle_dest }}:ro,z" when: cacert_bundle_exists.stat.exists -- name: Ensure /usr/libexec/edpm-start-podman-container exists +- name: Ensure /var/local/libexec/edpm-start-podman-container exists ansible.builtin.import_role: name: edpm_container_manage tasks_from: shutdown.yml diff --git a/roles/edpm_neutron_ovn/tasks/run.yml b/roles/edpm_neutron_ovn/tasks/run.yml index 8e4305f51..49a82a045 100644 --- a/roles/edpm_neutron_ovn/tasks/run.yml +++ b/roles/edpm_neutron_ovn/tasks/run.yml @@ -27,7 +27,7 @@ - "{{ edpm_neutron_ovn_tls_cacert_bundle_src }}:{{ edpm_neutron_ovn_tls_cacert_bundle_dest }}:ro,z" when: cacert_bundle_exists.stat.exists -- name: Ensure /usr/libexec/edpm-start-podman-container exists +- name: Ensure /var/local/libexec/edpm-start-podman-container exists ansible.builtin.import_role: name: edpm_container_manage tasks_from: shutdown.yml diff --git a/roles/edpm_neutron_sriov/tasks/run.yml b/roles/edpm_neutron_sriov/tasks/run.yml index a2600212e..4b264fd16 100644 --- a/roles/edpm_neutron_sriov/tasks/run.yml +++ b/roles/edpm_neutron_sriov/tasks/run.yml @@ -27,7 +27,7 @@ - "{{ edpm_neutron_sriov_tls_cacert_bundle_src }}:{{ edpm_neutron_sriov_tls_cacert_bundle_dest }}:ro,z" when: cacert_bundle_exists.stat.exists -- name: Ensure /usr/libexec/edpm-start-podman-container exists +- name: Ensure /var/local/libexec/edpm-start-podman-container exists ansible.builtin.import_role: name: edpm_container_manage tasks_from: shutdown.yml diff --git a/roles/edpm_nvmeof/tasks/install.yml b/roles/edpm_nvmeof/tasks/install.yml index 5f0b5be98..e7621359b 100644 --- a/roles/edpm_nvmeof/tasks/install.yml +++ b/roles/edpm_nvmeof/tasks/install.yml @@ -29,3 +29,4 @@ ansible.builtin.package: name: nvme-cli state: present + when: not ansible_local.bootc diff --git a/roles/edpm_ovn/tasks/run.yml b/roles/edpm_ovn/tasks/run.yml index 2571db040..7fec6937f 100644 --- a/roles/edpm_ovn/tasks/run.yml +++ b/roles/edpm_ovn/tasks/run.yml @@ -27,7 +27,7 @@ - "{{ edpm_ovn_controller_tls_cacert_bundle_src }}:{{ edpm_ovn_controller_tls_cacert_bundle_dest }}:ro,z" when: cacert_bundle_exists.stat.exists -- name: Ensure /usr/libexec/edpm-start-podman-container exists +- name: Ensure /var/local/libexec/edpm-start-podman-container exists ansible.builtin.import_role: name: edpm_container_manage tasks_from: shutdown.yml diff --git a/roles/edpm_ovn_bgp_agent/tasks/run.yml b/roles/edpm_ovn_bgp_agent/tasks/run.yml index 1440b4b4a..be7378975 100644 --- a/roles/edpm_ovn_bgp_agent/tasks/run.yml +++ b/roles/edpm_ovn_bgp_agent/tasks/run.yml @@ -27,7 +27,7 @@ - "{{ edpm_ovn_bgp_agent_tls_cacert_bundle_src }}:{{ edpm_ovn_bgp_agent_tls_cacert_bundle_dest }}:ro,z" when: cacert_bundle_exists.stat.exists -- name: Ensure /usr/libexec/edpm-start-podman-container exists +- name: Ensure /var/local/libexec/edpm-start-podman-container exists ansible.builtin.import_role: name: osp.edpm.edpm_container_manage tasks_from: shutdown.yml diff --git a/roles/edpm_ovn_bgp_agent/tasks/run_ovn.yml b/roles/edpm_ovn_bgp_agent/tasks/run_ovn.yml index eb0987fe3..deb18e4f3 100644 --- a/roles/edpm_ovn_bgp_agent/tasks/run_ovn.yml +++ b/roles/edpm_ovn_bgp_agent/tasks/run_ovn.yml @@ -27,7 +27,7 @@ - "{{ edpm_ovn_bgp_agent_tls_cacert_bundle_src }}:{{ edpm_ovn_bgp_agent_tls_cacert_bundle_dest }}:ro,z" when: cacert_bundle_exists.stat.exists -- name: Ensure /usr/libexec/edpm-start-podman-container exists +- name: Ensure /var/local/libexec/edpm-start-podman-container exists ansible.builtin.import_role: name: edpm_container_manage tasks_from: shutdown.yml diff --git a/roles/edpm_ovs/tasks/download_cache.yml b/roles/edpm_ovs/tasks/download_cache.yml index 000491b7b..e07f5a819 100644 --- a/roles/edpm_ovs/tasks/download_cache.yml +++ b/roles/edpm_ovs/tasks/download_cache.yml @@ -9,3 +9,4 @@ until: _install_packages_result is succeeded retries: "{{ edpm_ovs_download_retries }}" delay: "{{ edpm_ovs_download_delay }}" + when: not ansible_local.bootc diff --git a/roles/edpm_ovs/tasks/install.yml b/roles/edpm_ovs/tasks/install.yml index 590e294d7..535c485ea 100644 --- a/roles/edpm_ovs/tasks/install.yml +++ b/roles/edpm_ovs/tasks/install.yml @@ -11,6 +11,7 @@ until: edpm_ovs_package_install is succeeded retries: "{{ edpm_ovs_download_retries }}" delay: "{{ edpm_ovs_download_delay }}" + when: not ansible_local.bootc - name: Ensure ovs services are enabled and running tags: diff --git a/roles/edpm_podman/tasks/install.yml b/roles/edpm_podman/tasks/install.yml index f86546df5..0a09ae039 100644 --- a/roles/edpm_podman/tasks/install.yml +++ b/roles/edpm_podman/tasks/install.yml @@ -25,6 +25,7 @@ until: edpm_podman_package_download is succeeded retries: "{{ edpm_podman_download_retries }}" delay: "{{ edpm_podman_download_delay }}" + when: not ansible_local.bootc - name: Ensure we get the ansible interfaces facts when: diff --git a/roles/edpm_reboot/tasks/main.yaml b/roles/edpm_reboot/tasks/main.yaml index b46d07ee1..3df54acba 100644 --- a/roles/edpm_reboot/tasks/main.yaml +++ b/roles/edpm_reboot/tasks/main.yaml @@ -18,6 +18,7 @@ become: true ansible.builtin.dnf: name: yum-utils + when: not ansible_local.bootc - name: Check if reboot is required with needs-restarting ansible.builtin.command: needs-restarting -r diff --git a/roles/edpm_sshd/tasks/install.yml b/roles/edpm_sshd/tasks/install.yml index b7ad8be07..07d37c933 100644 --- a/roles/edpm_sshd/tasks/install.yml +++ b/roles/edpm_sshd/tasks/install.yml @@ -26,6 +26,7 @@ until: _sshd_install_result is succeeded retries: "{{ edpm_sshd_download_retries }}" delay: "{{ edpm_sshd_download_delay }}" + when: not ansible_local.bootc # NOTE(mwhahaha): we need this here because in order to validate our generated # config, we need to ensure the host keys exist diff --git a/roles/edpm_swift/tasks/run.yml b/roles/edpm_swift/tasks/run.yml index 371fcdafe..39bb9422a 100644 --- a/roles/edpm_swift/tasks/run.yml +++ b/roles/edpm_swift/tasks/run.yml @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -- name: Ensure /usr/libexec/edpm-start-podman-container exists +- name: Ensure /var/local/libexec/edpm-start-podman-container exists ansible.builtin.import_role: name: edpm_container_manage tasks_from: shutdown.yml diff --git a/roles/edpm_timezone/tasks/configure.yml b/roles/edpm_timezone/tasks/configure.yml index afd885287..bc20e1a6a 100644 --- a/roles/edpm_timezone/tasks/configure.yml +++ b/roles/edpm_timezone/tasks/configure.yml @@ -15,6 +15,23 @@ # under the License. +# TODO(slagle): should this be in edpm-image-builder instead? +- name: Manage /etc/localtime + when: ansible_local.bootc + block: + - name: Check for /etc/localtime + stat: + path: /etc/localtime + register: localtime_stat + + - name: Symlink /etc/localtime to timezone file if it doesn't exist + become: true + file: + state: link + path: /etc/localtime + src: /usr/share/zoneinfo/{{ edpm_timezone }} + when: not localtime_stat.stat.exists + - name: Set timezone become: true community.general.timezone: diff --git a/roles/edpm_tuned/tasks/main.yml b/roles/edpm_tuned/tasks/main.yml index 575fc3722..c381ea5ae 100644 --- a/roles/edpm_tuned/tasks/main.yml +++ b/roles/edpm_tuned/tasks/main.yml @@ -17,6 +17,7 @@ - name: Install packages ansible.builtin.include_tasks: install.yml + when: not ansible_local.bootc - name: Configure tuned ansible.builtin.include_tasks: configure.yml