Merge "Fix rootwrap.conf distribution for EL" into stable/2023.2

vars/debian.yml

@@ -35,3 +35,5 @@ glance_service_distro_packages:
 glance_oslomsg_amqp1_distro_packages:
   - libsasl2-modules
   - sasl2-bin
+
+glance_core_files: "{{ _glance_core_files }}"

vars/main.yml

@@ -83,7 +83,7 @@ _glance_rootwrap_conf_overrides:
   DEFAULT:
     exec_dirs: "{{ _glance_bin }},/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin"
 
-glance_core_files:
+_glance_core_files:
   - tmp_f: "/tmp/glance-api-paste.ini"
     target_f: "{{ glance_etc_dir }}/glance-api-paste.ini"
     config_overrides: "{{ glance_glance_api_paste_ini_overrides }}"

vars/redhat.yml

@@ -33,11 +33,4 @@ glance_oslomsg_amqp1_distro_packages:
   - cyrus-sasl-plain
   - cyrus-sasl-md5
 
-_glance_core_files:
-  - tmp_f: "/tmp/glance-api-dist-paste.ini"
-    target_f: "{{ glance_etc_dir }}/glance-api-paste.ini"
-    target_f_override: "{{ glance_etc_dir }}/glance-api-paste.ini"
-    config_overrides: "{{ glance_glance_api_paste_ini_overrides }}"
-    config_type: "ini"
-
 glance_core_files: "{{ (glance_install_method == 'source') | ternary(_glance_core_files, []) }}"