Merge pull request #984 from ASBishop/OSPRH-17176

edpm_iscsid: move iscsid from container to host

Author: openshift-merge-bot[bot]

roles/edpm_container_standalone/defaults/main.yml

@@ -64,4 +64,3 @@ edpm_container_standalone_volumes: "{{
   }}"
 
 edpm_deploy_identifier: ''
-edpm_iscsid_config_volume: /var/lib/config-data/ansible-generated/iscsid

roles/edpm_container_standalone/meta/argument_specs.yml

@@ -63,7 +63,3 @@ argument_specs:
         default: /etc/ipa/ca.crt
         description: Path to TLS certificate.
         type: path
-      edpm_iscsid_config_volume:
-        default: /var/lib/config-data/ansible-generated/iscsid
-        description: Path to iscsid config directory.
-        type: path

roles/edpm_container_standalone/molecule/default/prepare.yml

@@ -20,6 +20,8 @@
     - role: ../../../../molecule/common/test_deps
       test_deps_extra_packages:
         - podman
+      test_deps_setup_edpm: true
+      test_deps_setup_stream: true
 - name: Prepare
   hosts: all
   gather_facts: false

roles/edpm_download_cache/tasks/container_images.yml

@@ -8,15 +8,6 @@
     - edpm_podman
     - download_cache
 
-- name: Download images for edpm_iscsid role
-  when: '"nova" in edpm_download_cache_running_services'
-  ansible.builtin.include_role:
-    name: osp.edpm.edpm_iscsid
-    tasks_from: download_cache.yml
-  tags:
-    - edpm_iscsid
-    - download_cache
-
 - name: Download images for edpm_ovn role
   when: '"ovn" in edpm_download_cache_running_services'
   ansible.builtin.include_role:

roles/edpm_download_cache/tasks/packages.yml

@@ -66,3 +66,13 @@
   tags:
     - edpm_libvirt
     - download_cache
+
+- name: Download packages for edpm_iscsid role
+  # iscsid is part of the "nova" EDPM service
+  when: '"nova" in edpm_download_cache_running_services'
+  ansible.builtin.include_role:
+    name: osp.edpm.edpm_iscsid
+    tasks_from: download_cache.yml
+  tags:
+    - edpm_iscsid
+    - download_cache

roles/edpm_iscsid/defaults/main.yml

@@ -20,23 +20,13 @@
 # All variables within this role should have a prefix of "edpm_iscsid"
 
 # seconds between retries for download tasks
-edpm_iscsid_image_download_delay: "{{ edpm_download_delay | default(60) }}"
+edpm_iscsid_download_delay: "{{ edpm_download_delay | default(60) }}"
 
 # number of retries for download tasks
-edpm_iscsid_image_download_retries: "{{ edpm_download_retries | default(5) }}"
+edpm_iscsid_download_retries: "{{ edpm_download_retries | default(5) }}"
 
-edpm_iscsid_debug: "{{ (ansible_verbosity | int) >= 2 | bool }}"
-
-edpm_iscsid_image: "quay.io/podified-antelope-centos9/openstack-iscsid:current-podified"
-edpm_iscsid_volumes:
-  - /var/lib/kolla/config_files/iscsid.json:/var/lib/kolla/config_files/config.json:ro
-  - /dev:/dev
-  - /run:/run
-  - /sys:/sys
-  - /lib/modules:/lib/modules:ro
-  - /etc/iscsi:/etc/iscsi:z
-  - /etc/target:/etc/target:z
-  - /var/lib/iscsi:/var/lib/iscsi:z
+edpm_iscsid_packages:
+  - iscsi-initiator-utils
 
 edpm_iscsid_chap_algs: >-
   {{
@@ -45,5 +35,9 @@ edpm_iscsid_chap_algs: >-
     default('check', true) == 'enabled') |
     ternary('', ',SHA1,MD5')
   }}
-# if container health check should be enabled
-edpm_iscsid_healthcheck: true
+
+edpm_iscsid_legacy_services:
+  - tripleo_iscsid.service
+  - edpm_iscsid.service
+
+edpm_iscsid_tripleo_config_dir: '/var/lib/config-data/puppet-generated/iscsid/etc/iscsi'

roles/edpm_iscsid/files/healthchecks/iscsid/healthcheck

@@ -1,8 +1,7 @@
 ---
 
-- name: Record the iscsid container restart is required
+- name: Restart the iscsid service
   become: true
-  ansible.builtin.file:
-    path: /etc/iscsi/.iscsid_restart_required
-    state: touch
-    mode: "0600"
+  ansible.builtin.systemd_service:
+    name: iscsid
+    state: restarted

roles/edpm_iscsid/files/iscsid.yaml

@@ -4,43 +4,33 @@ argument_specs:
   main:
     short_description: The main entry point for the edpm_iscsid role.
     options:
-      edpm_iscsid_image_download_delay:
+      edpm_iscsid_download_delay:
         type: int
-        default: 5
+        default: 60
         description: The seconds between retries for failed download tasks
-      edpm_iscsid_image_download_retries:
+      edpm_iscsid_download_retries:
         type: int
         default: 5
         description: The number of retries for failed download tasks
-      edpm_iscsid_debug:
-        type: bool
-        default: false
-        description: |
-          Produce additional text messages describing role operation.
-          Set to false by default using following template:
-          {{ (ansible_verbosity | int) >= 2 | bool }}
-      edpm_iscsid_image:
-        type: str
-        default: "quay.io/podified-antelope-centos9/openstack-iscsid:current-podified"
-        description: URL of the iscsid container image.
-      edpm_iscsid_volumes:
+      edpm_iscsid_packages:
         type: list
+        description: The list of packages to install for iscsid.
         default:
-          - /var/lib/kolla/config_files/iscsid.json:/var/lib/kolla/config_files/config.json:ro
-          - /dev:/dev
-          - /run:/run
-          - /sys:/sys
-          - /lib/modules:/lib/modules:ro
-          - /etc/iscsi:/etc/iscsi:z
-          - /etc/target:/etc/target:z
-          - /var/lib/iscsi:/var/lib/iscsi:z
-        description: List of iscsid volume mounts with permissions.
+          - iscsi-initiator-utils
       edpm_iscsid_chap_algs:
         type: str
         default: 'SHA3-256,SHA256,SHA1,MD5'
         description: List of allowed CHAP algorithms.
-      edpm_iscsid_healthcheck:
-        type: bool
-        default: true
+      edpm_iscsid_legacy_services:
+        type: list
+        description: |
+          The list of legacy containerized services associated with adoption
+          and brownfield deployment scenarios.
+        default:
+          - tripleo_iscsid.service
+          - edpm_iscsid.service
+      edpm_iscsid_tripleo_config_dir:
+        type: str
+        default: '/var/lib/config-data/puppet-generated/iscsid/etc/iscsi'
         description: |
-          Enable container health check injection
+          The directory containing the iscsid configuration generated by tripleo.