Revert "Wire-in Apache MPM module parameters and switch it"

This reverts commit 09cfcc1464.

Change-Id: Ife71b124fa404050fcbcb2e041590a295076d6d9

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

@@ -52,12 +52,6 @@ parameters:
       e.g. { aodh-context_is_admin: { key: context_is_admin, value: 'role:admin' } }
     default: {}
     type: json
-  ApacheMPMModule:
-    type: string
-    default: 'event'
-    description: Specifies the used MPM module for Apache.
-    constraints:
-      - allowed_values: ['prefork', 'event']
 
 conditions:
 
@@ -90,7 +84,6 @@ resources:
       EndpointMap: {get_param: EndpointMap}
       RoleName: {get_param: RoleName}
       RoleParameters: {get_param: RoleParameters}
-      ApacheMPMModule: {get_param: ApacheMPMModule}
       EnableInternalTLS: {get_param: EnableInternalTLS}
 
 outputs:

deployment/apache/apache-baremetal-puppet.j2.yaml

@@ -47,17 +47,10 @@ parameters:
     type: string
     description: Specifies the default CA cert to use if TLS is used for
                  services in the internal network.
-  ApacheMPMModule:
-    type: string
-    default: 'event'
-    description: Specifies the used MPM module for Apache.
-    constraints:
-      - allowed_values: ['prefork', 'event']
 
 conditions:
 
   internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
-  use_mpm_prefork: {equals: [{get_param: ApacheMPMModule}, 'prefork']}
 
 resources:
 
@@ -97,22 +90,14 @@ outputs:
             apache::trace_enable: 'Off'
             apache::server_signature: 'Off'
             apache::server_tokens: 'Prod'
+            apache::mod::prefork::maxclients: { get_param: ApacheMaxRequestWorkers }
+            apache::mod::prefork::serverlimit: { get_param: ApacheServerLimit }
             apache::mod::remoteip::proxy_ips:
               get_param:
                 - ServiceData
                 - net_cidr_map
                 - {get_param: [ServiceNetMap, ApacheNetwork]}
             apache::mod::alias::icons_options: 'None'
-          - if:
-            - use_mpm_prefork
-            -
-              apache::mod::prefork::maxclients: { get_param: ApacheMaxRequestWorkers }
-              apache::mod::prefork::serverlimit: { get_param: ApacheServerLimit }
-              tripleo::profile::base::apache::mpm_module: 'prefork'
-            -
-              apache::mod::event::maxclients: { get_param: ApacheMaxRequestWorkers }
-              apache::mod::event::serverlimit: { get_param: ApacheServerLimit }
-              tripleo::profile::base::apache::mpm_module: 'event'
           - if:
             - internal_tls_enabled
             -

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

@@ -78,12 +78,6 @@ parameters:
     type: string
     default: 'messagingv2'
     description: Driver or drivers to handle sending notifications.
-  ApacheMPMModule:
-    type: string
-    default: 'event'
-    description: Specifies the used MPM module for Apache.
-    constraints:
-      - allowed_values: ['prefork', 'event']
 
 conditions:
 
@@ -117,7 +111,6 @@ resources:
       EndpointMap: {get_param: EndpointMap}
       RoleName: {get_param: RoleName}
       RoleParameters: {get_param: RoleParameters}
-      ApacheMPMModule: {get_param: ApacheMPMModule}
       EnableInternalTLS: {get_param: EnableInternalTLS}
 
 outputs:

deployment/deprecated/panko/panko-api-container-puppet.yaml

@@ -101,12 +101,6 @@ parameters:
     description: >
         Cron to delete events from db - Week Day
     default: '*'
-  ApacheMPMModule:
-    type: string
-    default: 'event'
-    description: Specifies the used MPM module for Apache.
-    constraints:
-      - allowed_values: ['prefork', 'event']
 
 conditions:
   service_debug_unset: {equals : [{get_param: PankoDebug}, '']}
@@ -129,7 +123,6 @@ resources:
       DefaultPasswords: {get_param: DefaultPasswords}
       RoleName: {get_param: RoleName}
       RoleParameters: {get_param: RoleParameters}
-      ApacheMPMModule: {get_param: ApacheMPMModule}
 
   PankoApiLogging:
     type: OS::TripleO::Services::Logging::PankoApi

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

@@ -78,12 +78,6 @@ parameters:
       e.g. { ec2api-context_is_admin: { key: context_is_admin, value: 'role:admin' } }
     default: {}
     type: json
-  ApacheMPMModule:
-    type: string
-    default: 'event'
-    description: Specifies the used MPM module for Apache.
-    constraints:
-      - allowed_values: ['prefork', 'event']
 
 conditions:
 
@@ -108,7 +102,6 @@ resources:
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
-      ApacheMPMModule: {get_param: ApacheMPMModule}
       EnableInternalTLS: {get_param: EnableInternalTLS}
 
 outputs:

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

@@ -227,12 +227,6 @@ parameters:
   ContainerGlanceApiConfigImage:
     description: The container image to use for the glance_api config_volume
     type: string
-  ApacheMPMModule:
-    type: string
-    default: 'event'
-    description: Specifies the used MPM module for Apache.
-    constraints:
-      - allowed_values: ['prefork', 'event']
 
 conditions:
 
@@ -288,7 +282,6 @@ resources:
       EndpointMap: {get_param: EndpointMap}
       RoleName: {get_param: RoleName}
       RoleParameters: {get_param: RoleParameters}
-      ApacheMPMModule: {get_param: ApacheMPMModule}
       EnableInternalTLS: {get_param: EnableInternalTLS}
 
 outputs:

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

@@ -106,12 +106,6 @@ parameters:
     default: ''
     description: Indicate whether this resource may be shared with the domain received in the request
                  "origin" header.
-  ApacheMPMModule:
-    type: string
-    default: 'event'
-    description: Specifies the used MPM module for Apache.
-    constraints:
-      - allowed_values: ['prefork', 'event']
 
 conditions:
   cors_allowed_origin_unset: {equals : [{get_param: GnocchiCorsAllowedOrigin}, '']}
@@ -141,7 +135,6 @@ resources:
       EndpointMap: {get_param: EndpointMap}
       RoleName: {get_param: RoleName}
       RoleParameters: {get_param: RoleParameters}
-      ApacheMPMModule: {get_param: ApacheMPMModule}
       EnableInternalTLS: {get_param: EnableInternalTLS}
 
 outputs:

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

@@ -60,12 +60,6 @@ parameters:
   MonitoringSubscriptionHeatApiCnf:
     default: 'overcloud-heat-api-cfn'
     type: string
-  ApacheMPMModule:
-    type: string
-    default: 'event'
-    description: Specifies the used MPM module for Apache.
-    constraints:
-      - allowed_values: ['prefork', 'event']
 
 conditions:
 
@@ -86,7 +80,6 @@ resources:
       EndpointMap: {get_param: EndpointMap}
       RoleName: {get_param: RoleName}
       RoleParameters: {get_param: RoleParameters}
-      ApacheMPMModule: {get_param: ApacheMPMModule}
       EnableInternalTLS: {get_param: EnableInternalTLS}
 
   HeatBase:

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

@@ -74,12 +74,6 @@ parameters:
       e.g. { heat-context_is_admin: { key: context_is_admin, value: 'role:admin' } }
     default: {}
     type: json
-  ApacheMPMModule:
-    type: string
-    default: 'event'
-    description: Specifies the used MPM module for Apache.
-    constraints:
-      - allowed_values: ['prefork', 'event']
 
 conditions:
 
@@ -100,7 +94,6 @@ resources:
       EndpointMap: {get_param: EndpointMap}
       RoleName: {get_param: RoleName}
       RoleParameters: {get_param: RoleParameters}
-      ApacheMPMModule: {get_param: ApacheMPMModule}
       EnableInternalTLS: {get_param: EnableInternalTLS}
 
   HeatBase:

deployment/horizon/horizon-container-puppet.yaml

@@ -124,12 +124,6 @@ parameters:
     description: Specifies a mapping from SSO authentication choice to identity
                  provider and protocol.  The identity provider and protocol names
                  must match the resources defined in keystone.
-  ApacheMPMModule:
-    type: string
-    default: 'event'
-    description: Specifies the used MPM module for Apache.
-    constraints:
-      - allowed_values: ['prefork', 'event']
 
 conditions:
   debug_unset: {equals : [{get_param: Debug}, '']}
@@ -141,18 +135,6 @@ resources:
   ContainersCommon:
     type: ../containers-common.yaml
 
-  ApacheServiceBase:
-    type: ../../deployment/apache/apache-baremetal-puppet.yaml
-    properties:
-      ServiceData: {get_param: ServiceData}
-      ServiceNetMap: {get_param: ServiceNetMap}
-      DefaultPasswords: {get_param: DefaultPasswords}
-      EndpointMap: {get_param: EndpointMap}
-      RoleName: {get_param: RoleName}
-      RoleParameters: {get_param: RoleParameters}
-      ApacheMPMModule: {get_param: ApacheMPMModule}
-      EnableInternalTLS: {get_param: EnableInternalTLS}
-
 outputs:
   role_data:
     description: Role data for the Horizon API role.
@@ -161,7 +143,6 @@ outputs:
       monitoring_subscription: {get_param: MonitoringSubscriptionHorizon}
       config_settings:
         map_merge:
-        - get_attr: [ApacheServiceBase, role_data, config_settings]
         - horizon::allowed_hosts: {get_param: HorizonAllowedHosts}
           tripleo::horizon::firewall_rules:
             '126 horizon':

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

@@ -61,12 +61,6 @@ parameters:
   EnableInternalTLS:
     type: boolean
     default: false
-  ApacheMPMModule:
-    type: string
-    default: 'event'
-    description: Specifies the used MPM module for Apache.
-    constraints:
-      - allowed_values: ['prefork', 'event']
 
 conditions:
   internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
@@ -83,7 +77,6 @@ resources:
       EndpointMap: {get_param: EndpointMap}
       RoleName: {get_param: RoleName}
       RoleParameters: {get_param: RoleParameters}
-      ApacheMPMModule: {get_param: ApacheMPMModule}
       EnableInternalTLS: {get_param: EnableInternalTLS}
 
   ContainersCommon:

deployment/ironic/ironic-pxe-container-puppet.yaml

@@ -36,37 +36,18 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
-  ApacheMPMModule:
-    type: string
-    default: 'event'
-    description: Specifies the used MPM module for Apache.
-    constraints:
-      - allowed_values: ['prefork', 'event']
 
 resources:
 
   ContainersCommon:
     type: ../containers-common.yaml
 
-  ApacheServiceBase:
-    type: ../../deployment/apache/apache-baremetal-puppet.yaml
-    properties:
-      ServiceData: {get_param: ServiceData}
-      ServiceNetMap: {get_param: ServiceNetMap}
-      DefaultPasswords: {get_param: DefaultPasswords}
-      EndpointMap: {get_param: EndpointMap}
-      RoleName: {get_param: RoleName}
-      RoleParameters: {get_param: RoleParameters}
-      ApacheMPMModule: {get_param: ApacheMPMModule}
-      EnableInternalTLS: false
-
 outputs:
   role_data:
     description: Role data for the Ironic PXE role.
     value:
       service_name: ironic_pxe
-      config_settings:
+      config_settings: {}
-        get_attr: [ApacheServiceBase, role_data, config_settings]
       service_config_settings: {}
       # BEGIN DOCKER SETTINGS
       puppet_config:

deployment/keystone/keystone-container-puppet.yaml

@@ -340,12 +340,6 @@ parameters:
     description: >-
       Attribute to be used to obtain the entity ID of the Identity Provider
       from the environment.
-  ApacheMPMModule:
-    type: string
-    default: 'event'
-    description: Specifies the used MPM module for Apache.
-    constraints:
-      - allowed_values: ['prefork', 'event']
   KeystoneOpenIdcEnableOAuth:
     type: boolean
     default: false
@@ -374,7 +368,6 @@ resources:
       EndpointMap: {get_param: EndpointMap}
       RoleName: {get_param: RoleName}
       RoleParameters: {get_param: RoleParameters}
-      ApacheMPMModule: {get_param: ApacheMPMModule}
       EnableInternalTLS: {get_param: EnableInternalTLS}
 
   KeystoneLogging:

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

@@ -54,12 +54,6 @@ parameters:
   MonitoringSubscriptionManilaApi:
     default: 'overcloud-manila-api'
     type: string
-  ApacheMPMModule:
-    type: string
-    default: 'event'
-    description: Specifies the used MPM module for Apache.
-    constraints:
-      - allowed_values: ['prefork', 'event']
 
 conditions:
 
@@ -93,7 +87,6 @@ resources:
       EndpointMap: {get_param: EndpointMap}
       RoleName: {get_param: RoleName}
       RoleParameters: {get_param: RoleParameters}
-      ApacheMPMModule: {get_param: ApacheMPMModule}
       EnableInternalTLS: {get_param: EnableInternalTLS}
 
 outputs:

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

@@ -152,12 +152,6 @@ parameters:
       removed in Ocata.  Future releases will enable L3 HA by default if it is
       appropriate for the deployment type. Alternate mechanisms will be
       available to override.
-  ApacheMPMModule:
-    type: string
-    default: 'event'
-    description: Specifies the used MPM module for Apache.
-    constraints:
-      - allowed_values: ['prefork', 'event']
 parameter_groups:
 - label: deprecated
   description: |
@@ -190,7 +184,6 @@ resources:
       EndpointMap: {get_param: EndpointMap}
       RoleName: {get_param: RoleName}
       RoleParameters: {get_param: RoleParameters}
-      ApacheMPMModule: {get_param: ApacheMPMModule}
       EnableInternalTLS: {get_param: EnableInternalTLS}
 
   ContainersCommon:

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

@@ -95,12 +95,6 @@ parameters:
       e.g. { nova-context_is_admin: { key: context_is_admin, value: 'role:admin' } }
     default: {}
     type: json
-  ApacheMPMModule:
-    type: string
-    default: 'event'
-    description: Specifies the used MPM module for Apache.
-    constraints:
-      - allowed_values: ['prefork', 'event']
 
 conditions:
 
@@ -135,7 +129,6 @@ resources:
       EndpointMap: {get_param: EndpointMap}
       RoleName: {get_param: RoleName}
       RoleParameters: {get_param: RoleParameters}
-      ApacheMPMModule: {get_param: ApacheMPMModule}
       EnableInternalTLS: {get_param: EnableInternalTLS}
 
   NovaBase:

deployment/nova/nova-metadata-container-puppet.yaml

@@ -63,12 +63,6 @@ parameters:
   MonitoringSubscriptionNovaMetadata:
     default: 'overcloud-nova-metadata'
     type: string
-  ApacheMPMModule:
-    type: string
-    default: 'event'
-    description: Specifies the used MPM module for Apache.
-    constraints:
-      - allowed_values: ['prefork', 'event']
 
 conditions:
   internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
@@ -95,7 +89,6 @@ resources:
       EndpointMap: {get_param: EndpointMap}
       RoleName: {get_param: RoleName}
       RoleParameters: {get_param: RoleParameters}
-      ApacheMPMModule: {get_param: ApacheMPMModule}
       EnableInternalTLS: {get_param: EnableInternalTLS}
 
   NovaBase:

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

@@ -80,12 +80,6 @@ parameters:
     default: true
     description: Configure the nova flavor for the amphora.
     type: boolean
-  ApacheMPMModule:
-    type: string
-    default: 'event'
-    description: Specifies the used MPM module for Apache.
-    constraints:
-      - allowed_values: ['prefork', 'event']
 
 conditions:
 
@@ -120,18 +114,6 @@ resources:
       RoleName: {get_param: RoleName}
       RoleParameters: {get_param: RoleParameters}
 
-  ApacheServiceBase:
-    type: ../../deployment/apache/apache-baremetal-puppet.yaml
-    properties:
-      ServiceData: {get_param: ServiceData}
-      ServiceNetMap: {get_param: ServiceNetMap}
-      DefaultPasswords: {get_param: DefaultPasswords}
-      EndpointMap: {get_param: EndpointMap}
-      RoleName: {get_param: RoleName}
-      RoleParameters: {get_param: RoleParameters}
-      ApacheMPMModule: {get_param: ApacheMPMModule}
-      EnableInternalTLS: {get_param: EnableInternalTLS}
-
 outputs:
   role_data:
     description: Role data for the Octavia API role.
@@ -142,7 +124,6 @@ outputs:
         map_merge:
           - {get_attr: [OctaviaBase, role_data, config_settings]}
           - {get_attr: [OctaviaWorker, role_data, config_settings]}
-          - {get_attr: [ApacheServiceBase, role_data, config_settings]}
           - octavia::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
             octavia::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
             octavia::policy::policies: {get_param: OctaviaApiPolicies}

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

@@ -68,12 +68,6 @@ parameters:
     description: The password for the nova service and db account
     type: string
     hidden: true
-  ApacheMPMModule:
-    type: string
-    default: 'event'
-    description: Specifies the used MPM module for Apache.
-    constraints:
-      - allowed_values: ['prefork', 'event']
 
 conditions:
   placement_workers_zero: {equals : [{get_param: PlacementWorkers}, 0]}
@@ -90,7 +84,6 @@ resources:
       EndpointMap: {get_param: EndpointMap}
       RoleName: {get_param: RoleName}
       RoleParameters: {get_param: RoleParameters}
-      ApacheMPMModule: {get_param: ApacheMPMModule}
       EnableInternalTLS: {get_param: EnableInternalTLS}
 
   ContainersCommon:

deployment/swift/swift-proxy-container-puppet.yaml

@@ -87,12 +87,6 @@ parameters:
     default: ''
     description: Indicate whether this resource may be shared with the domain received in the request
                  "origin" header.
-  ApacheMPMModule:
-    type: string
-    default: 'event'
-    description: Specifies the used MPM module for Apache.
-    constraints:
-      - allowed_values: ['prefork', 'event']
 
 conditions:
 
@@ -125,7 +119,6 @@ resources:
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
-      ApacheMPMModule: {get_param: ApacheMPMModule}
       EnableInternalTLS: {get_param: EnableInternalTLS}
 
 outputs:

deployment/zaqar/zaqar-container-puppet.yaml

@@ -79,12 +79,6 @@ parameters:
     description: The password for the redis service account.
     type: string
     hidden: true
-  ApacheMPMModule:
-    type: string
-    default: 'event'
-    description: Specifies the used MPM module for Apache.
-    constraints:
-      - allowed_values: ['prefork', 'event']
 
 conditions:
   internal_tls_enabled: {get_param: EnableInternalTLS}
@@ -103,7 +97,6 @@ resources:
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
-      ApacheMPMModule: {get_param: ApacheMPMModule}
       EnableInternalTLS: {get_param: EnableInternalTLS}
 
   ContainersCommon:

releasenotes/notes/apache_mpm_tuning-679c7362ddb72111.yaml

@@ -1,12 +0,0 @@
----
-features:
-  - |
-    Add the 'ApacheMPMModule' parameter to control the used Apache MPM module
-    for the containerized API services executed as WSGI applications. Defaults
-    to 'prefork'.
-upgrade:
-  - |
-    Switch 'ApacheMPMModule' to 'event' for better TCP keep alive handling for
-    WSGI applications executing heartbeat threads, which is the most of
-    OpenStack API services. This work-arounds
-    `bug 1829062 <https://bugs.launchpad.net/tripleo/+bug/1829062>`_.