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

plugins/modules/container_config_hash.py

@@ -55,7 +55,7 @@
     description:
       - Config volume prefix
     type: str
-    default: '/var/lib/config-data'
+    default: '/var/lib/openstack'
 """
 
 EXAMPLES = """

plugins/modules/edpm_nftables_from_files.py

@@ -50,7 +50,7 @@
 - name: Get nftables rules
   register: edpm_nftables_rules
   edpm_nftables_from_files:
-    src: /var/lib/edpm-config/firewall
+    src: /var/lib/openstack/firewall
 """
 
 RETURN = """

plugins/modules/edpm_nftables_snippet.py

@@ -58,7 +58,7 @@
 EXAMPLES = """
 - name: Inject snippet for CI
   edpm_nftables_snippet:
-    dest: /var/lib/edpm-config/firewall/ci-rules.yaml
+    dest: /var/lib/openstack/firewall/ci-rules.yaml
     content: |
       - rule_name: 010 Allow SSH from everywhere
         rule:

roles/edpm_container_quadlet/tasks/main.yml

@@ -43,7 +43,7 @@
 - name: "Render container definitions: [{{ edpm_container_quadlet_service }} ]"
   become: true
   ansible.builtin.template:
-    src: "templates/service-quadlet-template.yaml.j2"
+    src: "service-quadlet-template.yaml.j2"
     dest: "{{ edpm_container_quadlet_systemd_config_dir }}/{{ edpm_container_quadlet_service }}.yaml"
     mode: "0644"
   # NOTE(tkajinam): Some containers can contain secrets in their environments.

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/openstack/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_basedir: "/var/lib/openstack/frr"
 edpm_frr_defaults: traditional
 edpm_frr_hostname: "{{ ansible_facts['hostname'] | default('') }}"
 edpm_frr_log_level: informational

roles/edpm_frr/templates/kolla_config/frr.yaml.j2 renamed to roles/edpm_frr/files/kolla_config/frr.yaml

@@ -135,7 +135,7 @@ argument_specs:
         description: ''
         type: str
       edpm_frr_config_basedir:
-        default: /var/lib/config-data/ansible-generated/frr
+        default: /var/lib/openstack/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/openstack/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/meta/argument_specs.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/openstack/frr"
         - "/etc/tmpfiles.d/"
-        - "/var/lib/config-data/ansible-generated/frr/etc/frr"
+        - "/var/lib/openstack/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/openstack/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/openstack/frr/etc/frr/frr.conf exist
           ansible.builtin.stat:
-            path: /var/lib/config-data/ansible-generated/frr/etc/frr/frr.conf
+            path: /var/lib/openstack/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/openstack/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/openstack/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/openstack/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/openstack/frr/etc/frr/daemons exist
           ansible.builtin.stat:
-            path: /var/lib/config-data/ansible-generated/frr/etc/frr/daemons
+            path: /var/lib/openstack/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/openstack/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/openstack/frr/etc/frr/daemons does not exist"
 
     - name: verify frr BGP and BFD firewall rules are applied
       block:

roles/edpm_frr/molecule/default/verify.yml

@@ -60,7 +60,7 @@
 
 - name: Configure FRR
   ansible.builtin.template:
-    src: frr.conf.j2
+    src: config/frr.conf.j2
     dest: "{{ edpm_frr_config_basedir }}/etc/frr/frr.conf"
     mode: '0644'
     selevel: s0
@@ -69,7 +69,7 @@
 
 - name: Configure FRR daemons
   ansible.builtin.template:
-    src: daemons.j2
+    src: config/daemons.j2
     dest: "{{ edpm_frr_config_basedir }}/etc/frr/daemons"
     mode: '0644'
     selevel: s0