Merge "Add redirects from ci.o.o to docs.o.o/infra"

modules/openstack_project/manifests/static.pp

@@ -66,20 +66,13 @@ class openstack_project::static (
   }
 
   ###########################################################
-  # CI
+  # legacy ci.openstack.org site redirect
 
   apache::vhost { 'ci.openstack.org':
-    port     => 80,
+    port          => 80,
-    priority => '50',
+    priority      => '50',
-    docroot  => '/srv/static/ci',
+    docroot       => 'MEANINGLESS_ARGUMENT',
-    require  => File['/srv/static/ci'],
+    template      => 'openstack_project/ci.vhost.erb',
-  }
-
-  file { '/srv/static/ci':
-    ensure  => directory,
-    owner   => 'jenkins',
-    group   => 'jenkins',
-    require => User['jenkins'],
   }
 
   ###########################################################

modules/openstack_project/templates/ci.vhost.erb

@@ -0,0 +1,22 @@
+# ************************************
+# Managed by Puppet
+# ************************************
+
+NameVirtualHost <%= @vhost_name %>:<%= @port %>
+<VirtualHost <%= @vhost_name %>:<%= @port %>>
+  ServerName <%= @srvname %>
+
+  RewriteEngine On
+  RewriteRule ^/jenkins-job-builder/(.*) http://docs.openstack.org/infra/jenkins-job-builder/$1 [last,redirect=permanent]
+  RewriteRule ^/nodepool/(.*) http://docs.openstack.org/infra/nodepool/$1 [last,redirect=permanent]
+  RewriteRule ^/openstackid/(.*) http://docs.openstack.org/infra/openstackid/$1 [last,redirect=permanent]
+  RewriteRule ^/shade/(.*) http://docs.openstack.org/infra/shade/$1 [last,redirect=permanent]
+  RewriteRule ^/storyboard/(.*) http://docs.openstack.org/infra/storyboard/$1 [last,redirect=permanent]
+  RewriteRule ^/zuul/(.*) http://docs.openstack.org/infra/zuul/$1 [last,redirect=permanent]
+  RewriteRule ^/(.*) http://docs.openstack.org/infra/system-config/$1 [last,redirect=permanent]
+
+  ErrorLog /var/log/apache2/<%= @name %>_error.log
+  LogLevel warn
+  CustomLog /var/log/apache2/<%= @name %>_access.log combined
+  ServerSignature Off
+</VirtualHost>