From b415375f8b86b583c6f1e53d3198c310dafc078a Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Fri, 3 May 2019 17:20:13 +0000
Subject: [PATCH] Revert "Add cache-control headers for
 service-types.openstack.org"

This reverts commit fc98399aa4e3837e74b4587df051e9c538fa1462.

Change-Id: Ie9562c096f865195bc44e55ea6425ad207d44e50
---
 modules/openstack_project/manifests/static.pp         | 11 -----------
 .../templates/static-https-redirect.vhost.erb         |  6 ------
 2 files changed, 17 deletions(-)

diff --git a/modules/openstack_project/manifests/static.pp b/modules/openstack_project/manifests/static.pp
index 907544a458..4a71481261 100644
--- a/modules/openstack_project/manifests/static.pp
+++ b/modules/openstack_project/manifests/static.pp
@@ -16,11 +16,6 @@ class openstack_project::static (
   $ssl_chain_file_contents = '',
   $jenkins_gitfullname = 'OpenStack Jenkins',
   $jenkins_gitemail = 'jenkins@openstack.org',
-  $expires = {
-    'service-types.openstack.org' => {
-      'application/json' => 'access plus 1 week'
-    }
-  }
 ) {
   class { 'project_config':
     url  => $project_config_repo,
@@ -68,12 +63,6 @@ class openstack_project::static (
     httpd::mod { 'headers': ensure => present }
   }
 
-  if ! defined(Httpd::Mod['expires']) {
-    httpd::mod { 'expires':
-        ensure => present,
-    }
-  }
-
   if ! defined(File['/srv/static']) {
     file { '/srv/static':
       ensure => directory,
diff --git a/modules/openstack_project/templates/static-https-redirect.vhost.erb b/modules/openstack_project/templates/static-https-redirect.vhost.erb
index ba68b239ef..839d044757 100644
--- a/modules/openstack_project/templates/static-https-redirect.vhost.erb
+++ b/modules/openstack_project/templates/static-https-redirect.vhost.erb
@@ -39,12 +39,6 @@
     AllowOverrideList Redirect RedirectMatch
     Satisfy Any
     Require all granted
-<%- if scope.lookupvar('openstack_project::static::expires').has_key? @vhost_name -%>
-    ExpiresActive On
-<%- scope.lookupvar('openstack_project::static::expires')[@vhost_name].each do |key,value| -%>
-    ExpiresByType <% key %> "<% value %>"
-<%- end -%>
-<%- end -%>
   </Directory>
   LogLevel warn
   ErrorLog /var/log/apache2/<%= @vhost_name %>_error.log