Make config directories consistent across services

Some services used edpm_container_standalone and others directly use
edpm_container_manage and the way we generate the config files and use
them is spread across multiple locations which is confusing and difficult
to troubleshoot. This sanitizes the locations.

This is required to identify all the services deployed vs to be deployed
and remove orphaned containers/services.

jira: https://issues.redhat.com/browse/OSPRH-19243

Signed-off-by: rabi <[email protected]>

Author: rabi

roles/edpm_container_standalone/defaults/main.yml

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

roles/edpm_container_standalone/meta/argument_specs.yml

@@ -64,6 +64,6 @@ argument_specs:
         description: Path to TLS certificate.
         type: path
       edpm_iscsid_config_volume:
-        default: /var/lib/config-data/ansible-generated/iscsid
+        default: /var/lib/config-data/iscsid
         description: Path to iscsid config directory.
         type: path

roles/edpm_derive_pci_device_spec/defaults/main.yml

@@ -19,7 +19,7 @@
 # All variables within this role should have a prefix of "edpm_derive_pci_device_spec"
 
 # Defaults for PCI derive script (nic-partitioning is enabled)
-edpm_derive_pci_device_spec_conf_dir: '/var/lib/config-data/ansible-generated/derive_devicespec'
+edpm_derive_pci_device_spec_conf_dir: '/var/lib/config-data/derive_devicespec'
 
 edpm_derive_sriov_device_spec_list: ''
 edpm_derive_pci_device_spec_conf_file: 20-sriov-device-spec.conf

roles/edpm_frr/defaults/main.yml

@@ -54,7 +54,7 @@ edpm_frr_bgp_peers: []
 edpm_frr_bgp_asn: 64999
 edpm_frr_bgp_uplinks: []
 edpm_frr_bgp_uplinks_scope: internal
-edpm_frr_config_basedir: "/var/lib/config-data/ansible-generated/frr"
+edpm_frr_config_dest: "/var/lib/config-data/frr"
 edpm_frr_defaults: traditional
 edpm_frr_hostname: "{{ ansible_facts['hostname'] | default('') }}"
 edpm_frr_log_level: informational
@@ -82,7 +82,7 @@ edpm_frr_volumes:
   - /etc/pki/tls/certs/ca-bundle.trust.crt:/etc/pki/tls/certs/ca-bundle.trust.crt:ro
   - /etc/pki/tls/cert.pem:/etc/pki/tls/cert.pem:ro
   - /var/lib/kolla/config_files/frr.json:/var/lib/kolla/config_files/config.json:ro
-  - "{{ edpm_frr_config_basedir }}:/var/lib/kolla/config_files/src:ro"
+  - "{{ edpm_frr_config_dest }}:/var/lib/kolla/config_files/src:ro"
   - /run/frr:/run/frr:shared,z
 
 # seconds between retries for download tasks

roles/edpm_frr/meta/argument_specs.yml

@@ -135,7 +135,7 @@ argument_specs:
         description: ''
         type: str
       edpm_frr_config_basedir:
-        default: /var/lib/config-data/ansible-generated/frr
+        default: /var/lib/config-data/frr
         description: Path to FRR configuration directory.
         type: path
       edpm_frr_defaults:
@@ -181,7 +181,7 @@ argument_specs:
           - /etc/pki/tls/certs/ca-bundle.trust.crt:/etc/pki/tls/certs/ca-bundle.trust.crt:ro
           - /etc/pki/tls/cert.pem:/etc/pki/tls/cert.pem:ro
           - /var/lib/kolla/config_files/frr.json:/var/lib/kolla/config_files/config.json:ro
-          - /var/lib/config-data/ansible-generated/frr:/var/lib/kolla/config_files/src:ro
+          - /var/lib/config-data/frr:/var/lib/kolla/config_files/src:ro
           - /run/frr:/run/frr:shared,z
         description: List of FRR volumes in a mountpoint form.
         type: list

roles/edpm_frr/molecule/default/verify.yml

@@ -9,9 +9,9 @@
       ansible.builtin.include_tasks: "{{test_helper_dir}}/verify_dir.yaml"
       loop:
         - "/var/lib/edpm-config/container-startup-config/frr"
-        - "/var/lib/config-data/ansible-generated/frr"
+        - "/var/lib/config-data/frr"
         - "/etc/tmpfiles.d/"
-        - "/var/lib/config-data/ansible-generated/frr/etc/frr"
+        - "/var/lib/config-data/frr/etc/frr"
 
     - name: ensure that /etc/tmpfiles.d/run-frr.conf file for frr exist
       become: true
@@ -26,31 +26,31 @@
               - check_frr_file.stat.exists
             fail_msg: "File /etc/tmpfiles.d/run-frr.conf does not exist"
 
-    - name: ensure that /var/lib/config-data/ansible-generated/frr/etc/frr/frr.conf file exist
+    - name: ensure that /var/lib/config-data/frr/etc/frr/frr.conf file exist
       become: true
       block:
-        - name: Check if file /var/lib/config-data/ansible-generated/frr/etc/frr/frr.conf exist
+        - name: Check if file /var/lib/config-data/frr/etc/frr/frr.conf exist
           ansible.builtin.stat:
-            path: /var/lib/config-data/ansible-generated/frr/etc/frr/frr.conf
+            path: /var/lib/config-data/frr/etc/frr/frr.conf
           register: check_frr_conf_file
-        - name: Assert file /var/lib/config-data/ansible-generated/frr/etc/frr/frr.conf exist
+        - name: Assert file /var/lib/config-data/frr/etc/frr/frr.conf exist
           ansible.builtin.assert:
             that:
               - check_frr_conf_file.stat.exists
-            fail_msg: "File /var/lib/config-data/ansible-generated/frr/etc/frr/frr.conf does not exist"
+            fail_msg: "File /var/lib/config-data/frr/etc/frr/frr.conf does not exist"
 
-    - name: ensure that /var/lib/config-data/ansible-generated/frr/etc/frr/daemons file exist
+    - name: ensure that /var/lib/config-data/frr/etc/frr/daemons file exist
       become: true
       block:
-        - name: Check if file /var/lib/config-data/ansible-generated/frr/etc/frr/daemons exist
+        - name: Check if file /var/lib/config-data/frr/etc/frr/daemons exist
           ansible.builtin.stat:
-            path: /var/lib/config-data/ansible-generated/frr/etc/frr/daemons
+            path: /var/lib/config-data/frr/etc/frr/daemons
           register: check_frr_daemons_file
-        - name: Assert file /var/lib/config-data/ansible-generated/frr/etc/frr/daemons exist
+        - name: Assert file /var/lib/config-data/frr/etc/frr/daemons exist
           ansible.builtin.assert:
             that:
               - check_frr_daemons_file.stat.exists
-            fail_msg: "File /var/lib/config-data/ansible-generated/frr/etc/frr/daemons does not exist"
+            fail_msg: "File /var/lib/config-data/frr/etc/frr/daemons does not exist"
 
     - name: verify frr BGP and BFD firewall rules are applied
       block:

roles/edpm_frr/tasks/configure.yml

@@ -60,17 +60,17 @@
 
 - name: Configure FRR
   ansible.builtin.template:
-    src: frr.conf.j2
-    dest: "{{ edpm_frr_config_basedir }}/etc/frr/frr.conf"
+    src: config/frr.conf.j2
+    dest: "{{ edpm_frr_config_dest }}/etc/frr/frr.conf"
     mode: '0644'
     selevel: s0
     setype: container_file_t
   register: _frr_config_result
 
 - name: Configure FRR daemons
   ansible.builtin.template:
-    src: daemons.j2
-    dest: "{{ edpm_frr_config_basedir }}/etc/frr/daemons"
+    src: config/daemons.j2
+    dest: "{{ edpm_frr_config_dest }}/etc/frr/daemons"
     mode: '0644'
     selevel: s0
     setype: container_file_t

roles/edpm_frr/tasks/install.yml

@@ -32,7 +32,7 @@
     owner: "{{ ansible_user | default(ansible_user_id) }}"
     group: "{{ ansible_user | default(ansible_user_id) }}"
   loop:
-    - {'path': "{{ edpm_frr_config_basedir }}", 'setype': container_file_t, 'mode': '0750'}
+    - {'path': "{{ edpm_frr_config_dest }}", 'setype': container_file_t, 'mode': '0750'}
     - {'path': /run/frr, 'setype': container_file_t, 'mode': '0755'}
     - {'path': /var/lib/edpm-config/firewall, 'setype': container_file_t, 'mode': '0750'}
 
@@ -53,9 +53,9 @@
       - "!min"
       - "selinux"
 
-- name: Create directory {{ edpm_frr_config_basedir }}
+- name: Create directory {{ edpm_frr_config_dest }}
   ansible.builtin.file:
-    path: "{{ edpm_frr_config_basedir }}/etc/frr"
+    path: "{{ edpm_frr_config_dest }}/etc/frr"
     recurse: true
     state: directory
     selevel: s0

roles/edpm_frr/tasks/run.yml

@@ -25,6 +25,6 @@
   vars:
     edpm_container_standalone_service: frr
     edpm_container_standalone_container_defs:
-      frr: "{{ lookup('template', 'frr.yaml.j2') | from_yaml }}"
+      frr: "{{ lookup('template', 'container_defs/frr.yaml.j2') | from_yaml }}"
     edpm_container_standalone_kolla_config_files:
-      frr: "{{ lookup('template', 'templates/kolla_config/frr.yaml.j2') | from_yaml }}"
+      frr: "{{ lookup('template', 'kolla_config/frr.yaml.j2') | from_yaml }}"