From 66dea3f74e0137938a5432a716da4bdfd5500528 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Thu, 7 Dec 2017 20:57:25 +0000
Subject: [PATCH] Remove docs-draft vhost from static.o.o

All draft documentation jobs now just publish content into an "html"
subtree of their job logs on logs.openstack.org and have been doing
so since longer than our configured content expiration period, so
the separate vhost for docs-draft.openstack.org is no longer
required and can be removed.

While here, change up the CORS configuration for
storyboard.openstack.org and storyboard-dev.openstack.org to respect
draft storyboard-webclient copies on logs.openstack.org rather than
simply removing these stanzas.

Once this change merges and configuration gets applied to
static.openstack.org, the allocated resources for the old docs-draft
vhost (logical volume, DNS entry) can be safely removed.

Change-Id: Ib44df24100192f7903eb60c6fc93feeea0894b90
---
 doc/source/static.rst                         |  1 -
 manifests/site.pp                             |  8 ++---
 modules/openstack_project/manifests/static.pp | 33 -------------------
 3 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/doc/source/static.rst b/doc/source/static.rst
index 571a7a9f7a..3d43e221fe 100644
--- a/doc/source/static.rst
+++ b/doc/source/static.rst
@@ -13,7 +13,6 @@ At a Glance
 
 :Hosts:
   * http://logs.openstack.org
-  * http://docs-draft.openstack.org
   * http://status.openstack.org
   * http://mirror.openstack.org
   * http://specs.openstack.org
diff --git a/manifests/site.pp b/manifests/site.pp
index 7db639b60a..d7a5f7fa5f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -755,11 +755,11 @@ node 'storyboard.openstack.org' {
     hostname                => $::fqdn,
     valid_oauth_clients     => [
       $::fqdn,
-      'docs-draft.openstack.org',
+      'logs.openstack.org',
     ],
     cors_allowed_origins     => [
       "https://${::fqdn}",
-      'http://docs-draft.openstack.org',
+      'http://logs.openstack.org',
     ],
     sender_email_address => 'storyboard@storyboard.openstack.org',
   }
@@ -779,11 +779,11 @@ node 'storyboard-dev.openstack.org' {
     hostname                => $::fqdn,
     valid_oauth_clients     => [
       $::fqdn,
-      'docs-draft.openstack.org',
+      'logs.openstack.org',
     ],
     cors_allowed_origins     => [
       "https://${::fqdn}",
-      'http://docs-draft.openstack.org',
+      'http://logs.openstack.org',
     ],
     sender_email_address => 'storyboard-dev@storyboard-dev.openstack.org',
   }
diff --git a/modules/openstack_project/manifests/static.pp b/modules/openstack_project/manifests/static.pp
index dc051985a8..bceeccf0e6 100644
--- a/modules/openstack_project/manifests/static.pp
+++ b/modules/openstack_project/manifests/static.pp
@@ -261,39 +261,6 @@ class openstack_project::static (
     require => [File['/srv/static/logs/help'], Vcsrepo['/opt/tripleo-ci']],
   }
 
-  ###########################################################
-  # Docs-draft
-
-  ::httpd::vhost { 'docs-draft.openstack.org':
-    port       => 443, # Is required despite not being used.
-    docroot    => '/srv/static/docs-draft',
-    priority   => '50',
-    ssl        => true,
-    template   => 'openstack_project/static-http-and-https.vhost.erb',
-    vhost_name => 'docs-draft.openstack.org',
-    require    => [
-      File['/srv/static/docs-draft'],
-      File[$cert_file],
-      File[$key_file],
-    ],
-  }
-
-  file { '/srv/static/docs-draft':
-    ensure  => directory,
-    owner   => 'jenkins',
-    group   => 'jenkins',
-    require => User['jenkins'],
-  }
-
-  file { '/srv/static/docs-draft/robots.txt':
-    ensure  => present,
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0444',
-    source  => 'puppet:///modules/openstack_project/disallow_robots.txt',
-    require => File['/srv/static/docs-draft'],
-  }
-
   ###########################################################
   # Security