Merge "Add trystack.o.o into -infra"

modules/openstack_project/manifests/static.pp

@@ -228,4 +228,22 @@ class openstack_project::static (
     serveraliases => ['*.devstack.org'],
     template      => 'openstack_project/devstack.vhost.erb',
   }
+
+  ###########################################################
+  # Trystack
+
+  apache::vhost { 'trystack.openstack.org':
+    port     => 80,
+    priority => '50',
+    docroot  => '/opt/trystack',
+    template => 'openstack_project/trystack.vhost.erb',
+    require  => Vcsrepo['/opt/trystack'],
+  }
+
+  vcsrepo { '/opt/trystack':
+    ensure   => latest,
+    provider => git,
+    revision => 'master',
+    source   => 'https://git.openstack.org/openstack-infra/trystack-site',
+  }
 }

modules/openstack_project/templates/trystack.vhost.erb

@@ -0,0 +1,21 @@
+# ************************************
+# Managed by Puppet
+# ************************************
+
+NameVirtualHost <%= @vhost_name %>:<%= @port %>
+<VirtualHost <%= @vhost_name %>:<%= @port %>>
+  ServerName <%= @srvname %>
+
+  DocumentRoot <%= @docroot %>
+  <Directory <%= @docroot %>>
+    Options <%= @options %>
+    AllowOverride None
+    Order allow,deny
+    allow from all
+  </Directory>
+
+  ErrorLog /var/log/apache2/<%= @name %>_error.log
+  LogLevel warn
+  CustomLog /var/log/apache2/<%= @name %>_access.log combined
+  ServerSignature Off
+</VirtualHost>