Revert "Fix generating Apache configs by container-puppet"

fixes following issue coming on RHEL8 http://logs.rdoproject.org/openstack-periodic-master/opendev.org/openstack/tripleo-ci/master/periodic-tripleo-ci-rhel-8-standalone-master/11c7794/logs/undercloud/var/log/extra/podman/containers/keystone_db_sync/stdout.log.txt.gz

This reverts commit 80d12514d5.

Change-Id: Ice566e90e468bc919872d0954d2d696f4554e00b

deployment/heat/heat-api-cfn-container-puppet.yaml

@@ -162,8 +162,7 @@ outputs:
         puppet_tags: heat_config,file,concat,file_line
         step_config: |
           include ::tripleo::profile::base::heat::api_cfn
-        config_image: &heat_api_cfn_config_image
-          {get_param: ContainerHeatApiCfnConfigImage}
+        config_image: {get_param: ContainerHeatApiCfnConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/heat_api_cfn.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -172,10 +171,6 @@ outputs:
               dest: "/etc/httpd/conf.d"
               merge: false
               preserve_properties: true
-            - source: "/var/lib/kolla/config_files/src/etc/httpd/conf.modules.d"
-              dest: "/etc/httpd/conf.modules.d"
-              merge: false
-              preserve_properties: true
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"
               merge: true
@@ -217,12 +212,6 @@ outputs:
                       - ''
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
-      container_puppet_tasks:
-        step_4:
-          config_volume: 'heat_api_cfn'
-          step_config: |
-            include ::tripleo::profile::base::apache
-          config_image: *heat_api_cfn_config_image
       host_prep_tasks: {get_attr: [HeatApiCfnLogging, host_prep_tasks]}
       upgrade_tasks: []
       metadata_settings:

deployment/heat/heat-api-container-puppet.yaml

@@ -178,8 +178,7 @@ outputs:
         puppet_tags: heat_config,file,concat,file_line
         step_config: |
           include ::tripleo::profile::base::heat::api
-        config_image: &heat_api_config_image
-          {get_param: ContainerHeatApiConfigImage}
+        config_image: {get_param: ContainerHeatApiConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/heat_api.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -188,10 +187,6 @@ outputs:
               dest: "/etc/httpd/conf.d"
               merge: false
               preserve_properties: true
-            - source: "/var/lib/kolla/config_files/src/etc/httpd/conf.modules.d"
-              dest: "/etc/httpd/conf.modules.d"
-              merge: false
-              preserve_properties: true
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"
               merge: true
@@ -265,12 +260,6 @@ outputs:
                   - /var/lib/config-data/puppet-generated/heat_api/:/var/lib/kolla/config_files/src:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
-      container_puppet_tasks:
-        step_4:
-          config_volume: 'heat_api'
-          step_config: |
-            include ::tripleo::profile::base::apache
-          config_image: *heat_api_config_image
       host_prep_tasks: {get_attr: [HeatApiLogging, host_prep_tasks]}
       upgrade_tasks: []
       metadata_settings: