WIP Make config directories consistent across services

Some services used edpm_container_standalone and some services
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.

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/config/containers/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/config/containers/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/config/containers/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/config/containers/step_1
     config_pattern: 'haproxy.json'
     config_overrides:
       haproxy:

plugins/modules/container_config_hash.py

@@ -63,7 +63,7 @@
   container_config_hash:
 """
 
-CONTAINER_STARTUP_CONFIG = '/var/lib/edpm-config/container-startup-config'
+CONTAINER_STARTUP_CONFIG = '/var/lib/openstack/config/containers'
 BUF_SIZE = 65536
 
 
@@ -86,7 +86,7 @@ def __init__(self, module, results):
         # Set parameters
         self.config_vol_prefix = args['config_vol_prefix']
 
-        # Update container-startup-config with new config hashes
+        # Update containers config with new config hashes
         self._update_hashes()
 
         self.module.exit_json(**self.results)

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/config/containers/step_1
 """
 
 

roles/edpm_container_standalone/defaults/main.yml

@@ -24,7 +24,7 @@ edpm_container_standalone_service: ""
 # Directory for kolla config files
 edpm_container_standalone_kolla_config_dir: /var/lib/kolla/config_files
 # Directory for container startup configs
-edpm_container_standalone_container_startup_config_dir: /var/lib/edpm-config/container-startup-config
+edpm_container_standalone_container_startup_config_dir: /var/lib/openstack/config/containers
 # Hash with keys of container name and value of YAML kolla config file.
 edpm_container_standalone_kolla_config_files: {}
 # Hash with keys of container name and value of YAML container definition
@@ -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

@@ -21,7 +21,7 @@ argument_specs:
         description: Parsed container definitions.
         type: dict
       edpm_container_standalone_container_startup_config_dir:
-        default: /var/lib/edpm-config/container-startup-config
+        default: /var/lib/openstack/config/containers
         description: Path to configuration directory.
         type: path
       edpm_container_standalone_internal_tls_volumes:
@@ -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_container_standalone/tasks/main.yml

@@ -33,18 +33,19 @@
     mode: "0600"
   loop: "{{ edpm_container_standalone_kolla_config_files | dict2items }}"
 
-- name: "Create config file {{ edpm_container_standalone_container_startup_config_dir + '/' + edpm_container_standalone_service }}"
+- name: "Ensure container config directory exists: {{ edpm_container_standalone_container_startup_config_dir }}"
   become: true
   ansible.builtin.file:
-    path: "{{ edpm_container_standalone_container_startup_config_dir }}/{{ edpm_container_standalone_service }}"
+    path: "{{ edpm_container_standalone_container_startup_config_dir }}"
     state: directory
     mode: "0755"
+    setype: "container_file_t"
 
 - name: "Render container definitions: [{{ edpm_container_standalone_service }} ]"
   become: true
   ansible.builtin.copy:
     content: "{{ item.value | to_nice_json }}"
-    dest: "{{ edpm_container_standalone_container_startup_config_dir }}/{{ edpm_container_standalone_service }}/{{ item.key }}.json"
+    dest: "{{ edpm_container_standalone_container_startup_config_dir }}/{{ item.key }}.json"
     mode: "0644"
   # NOTE(tkajinam): Some containers can contain secrets in their environments.
   #                 Hide the output to avoid dumping these to output.
@@ -55,6 +56,6 @@
   ansible.builtin.include_role:
     name: edpm_container_manage
   vars:
-    edpm_container_manage_config: "{{ edpm_container_standalone_container_startup_config_dir }}/{{ edpm_container_standalone_service }}"
+    edpm_container_manage_config: "{{ edpm_container_standalone_container_startup_config_dir }}"
     edpm_container_manage_config_patterns: "*.json"
     edpm_container_manage_config_id: "{{ edpm_container_standalone_service }}"

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

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