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

docs/source/roles/role-edpm_container_manage.rst

@@ -69,7 +69,7 @@ This Ansible role allows to do the following tasks:
           include_role:
             name: edpm_container_manage
           vars:
-            edpm_container_manage_config: "/var/lib/edpm-config/container-startup-config/step_1"
+            edpm_container_manage_config: "/var/lib/openstack/container-startup-config/step_1"
             edpm_container_manage_config_id: "edpm_step1"
 
 
@@ -141,7 +141,7 @@ overrides the image setting in one-off.
                 name: edpm_container_manage
               vars:
                 edpm_container_manage_config_patterns: 'haproxy.json'
-                edpm_container_manage_config: "/var/lib/edpm-config/container-startup-config/step_1"
+                edpm_container_manage_config: "/var/lib/openstack/container-startup-config/step_1"
                 edpm_container_manage_config_id: "edpm_step1"
                 edpm_container_manage_clean_orphans: false
                 edpm_container_manage_config_overrides:

plugins/modules/container_config_data.py

@@ -72,10 +72,10 @@
 EXAMPLES = """
 - name: Generate containers configs data
   container_config_data:
-    config_path: /var/lib/edpm-config/container-startup-config/step_1
+    config_path: /var/lib/openstack/container-startup-config/step_1
 - name: Generate containers configs data for HAproxy and override image
   container_config_data:
-    config_path: /var/lib/edpm-config/container-startup-config/step_1
+    config_path: /var/lib/openstack/container-startup-config/step_1
     config_pattern: 'haproxy.json'
     config_overrides:
       haproxy:

plugins/modules/container_config_hash.py

@@ -55,15 +55,15 @@
     description:
       - Config volume prefix
     type: str
-    default: '/var/lib/config-data'
+    default: '/var/lib/openstack'
 """
 
 EXAMPLES = """
 - name: Update config hashes for container startup configs
   container_config_hash:
 """
 
-CONTAINER_STARTUP_CONFIG = '/var/lib/edpm-config/container-startup-config'
+CONTAINER_STARTUP_CONFIG = '/var/lib/openstack/container-startup-config'
 BUF_SIZE = 65536
 
 

plugins/modules/edpm_container_manage.py

@@ -92,7 +92,7 @@
 - name: Run containers
   edpm_container_manage:
     config_id: edpm_step1
-    config_dir: /var/lib/edpm-config/container-startup-config/step_1
+    config_dir: /var/lib/openstack/container-startup-config/step_1
 """
 
 

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_ceph_hci_pre/defaults/main.yml

@@ -23,7 +23,7 @@
 edpm_ceph_hci_pre_configure_firewall: true
 
 # Name of file to be created on EDPM nodes with ceph firewall rules
-edpm_ceph_hci_pre_firewall_yaml_file: /var/lib/edpm-config/firewall/ceph-networks.yaml
+edpm_ceph_hci_pre_firewall_yaml_file: /var/lib/openstack/firewall/ceph-networks.yaml
 
 # List of IP ranges which can connect to Ceph RBD/Mon ports
 # If list is empty, the firewall rule will not specify a source address

roles/edpm_ceph_hci_pre/meta/argument_specs.yml

@@ -146,4 +146,4 @@ argument_specs:
           The absolute path to a YAML file on the EDPM node which will be
           created by the role. The file will be parsed by the edpm_nftables
           role which creates the actual firewall rule.
-        default: /var/lib/edpm-config/firewall/ceph-networks.yaml
+        default: /var/lib/openstack/firewall/ceph-networks.yaml

roles/edpm_ceph_hci_pre/molecule/default/converge.yml

@@ -25,7 +25,7 @@
   hosts: all
   gather_facts: false
   vars:
-    edpm_ceph_hci_pre_firewall_yaml_file: /var/lib/edpm-config/firewall/ceph-networks-overrides.yaml
+    edpm_ceph_hci_pre_firewall_yaml_file: /var/lib/openstack/firewall/ceph-networks-overrides.yaml
     edpm_ceph_hci_pre_storage_ranges: [172.18.0.0/24]
     edpm_ceph_hci_pre_rgw_frontend_ranges: [172.18.0.0/24]
     edpm_ceph_hci_pre_nfs_frontend_ranges: [172.18.0.0/24]

roles/edpm_ceph_hci_pre/molecule/default/verify.yml

@@ -19,7 +19,7 @@
   gather_facts: false
   tasks:
     - name: Read generated file from defaults
-      command: cat /var/lib/edpm-config/firewall/ceph-networks.yaml
+      command: cat /var/lib/openstack/firewall/ceph-networks.yaml
       register: ceph_networks
 
     - name: Assert that default generated file is correct
@@ -32,7 +32,7 @@
       loop: "{{ ceph_networks.stdout | from_yaml }}"
 
     - name: Read generated file from overrides
-      command: cat /var/lib/edpm-config/firewall/ceph-networks-overrides.yaml
+      command: cat /var/lib/openstack/firewall/ceph-networks-overrides.yaml
       register: ceph_networks_overrides
 
     - name: Assert that overridden generated file is correct