From 6872478d81952b671584d07b41f8c7617e6f8467 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Sat, 20 Aug 2016 15:22:46 +0000
Subject: [PATCH] Add a wiki-dev.o.o server to test newer mediawiki

The wiki-dev.openstack.org server will eventually be used to test
newer versions of Mediawiki and extensions/skins. To accommodate
this, also parameterize server backups so that they don't conflict
with production (and are in fact disabled entirely for the dev
site).

Change-Id: I6505d3af87f670e71a440c76873c085d97e5b82f
---
 manifests/site.pp                             | 19 +++++++++++++++++++
 .../files/puppetmaster/groups.txt             |  1 +
 modules/openstack_project/manifests/wiki.pp   | 18 ++++++++++--------
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 4313000a72..3e1b2e6880 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -374,6 +374,7 @@ node /^wiki\d+\.openstack\.org$/ {
   $group = "wiki"
   class { 'openstack_project::wiki':
     sysadmins                 => hiera('sysadmins', []),
+    bup_user                  => 'bup-wiki',
     serveradmin               => hiera('infra_apache_serveradmin'),
     site_hostname             => 'wiki.openstack.org',
     ssl_cert_file_contents    => hiera('ssl_cert_file_contents'),
@@ -391,6 +392,24 @@ node /^wiki\d+\.openstack\.org$/ {
   }
 }
 
+# Node-OS: trusty
+node /^wiki-dev\d+\.openstack\.org$/ {
+  $group = "wiki-dev"
+  class { 'openstack_project::wiki':
+    sysadmins             => hiera('sysadmins', []),
+    serveradmin           => hiera('infra_apache_serveradmin'),
+    site_hostname         => 'wiki-dev.openstack.org',
+    wg_dbserver           => hiera('wg_dbserver'),
+    wg_dbname             => 'openstack_wiki',
+    wg_dbuser             => 'wikiuser',
+    wg_dbpassword         => hiera('wg_dbpassword'),
+    wg_secretkey          => hiera('wg_secretkey'),
+    wg_upgradekey         => hiera('wg_upgradekey'),
+    wg_recaptchasitekey   => hiera('wg_recaptchasitekey'),
+    wg_recaptchasecretkey => hiera('wg_recaptchasecretkey'),
+  }
+}
+
 # Node-OS: trusty
 node 'logstash.openstack.org' {
   $iptables_es_rule = regsubst($elasticsearch_nodes,
diff --git a/modules/openstack_project/files/puppetmaster/groups.txt b/modules/openstack_project/files/puppetmaster/groups.txt
index 1ed336afeb..76b399efdd 100644
--- a/modules/openstack_project/files/puppetmaster/groups.txt
+++ b/modules/openstack_project/files/puppetmaster/groups.txt
@@ -11,4 +11,5 @@ wheel-mirror *wheel-mirror-*.openstack.org
 afsadmin mirror-update.openstack.org:release.slave.openstack.org
 signing signing*.ci.openstack.org
 wiki wiki*.openstack.org
+wiki-dev wiki-dev*.openstack.org
 disabled ci-backup-rs-ord.openstack.org:ask-staging.openstack.org:db368fcd-e61a-4294-a5cb-851c16650f7a:wiki.openstack.org
diff --git a/modules/openstack_project/manifests/wiki.pp b/modules/openstack_project/manifests/wiki.pp
index 1986735fc1..d53362222a 100644
--- a/modules/openstack_project/manifests/wiki.pp
+++ b/modules/openstack_project/manifests/wiki.pp
@@ -3,10 +3,11 @@
 class openstack_project::wiki (
   $site_hostname,
   $sysadmins = [],
+  $bup_user = undef,
   $serveradmin = undef,
-  $ssl_cert_file_contents = '',
-  $ssl_key_file_contents = '',
-  $ssl_chain_file_contents = '',
+  $ssl_cert_file_contents = undef,
+  $ssl_key_file_contents = undef,
+  $ssl_chain_file_contents = undef,
   $wg_dbserver = undef,
   $wg_dbname = undef,
   $wg_dbuser = undef,
@@ -67,11 +68,12 @@ class openstack_project::wiki (
     database_password => $wg_dbpassword,
   }
 
-
-  include bup
-  bup::site { 'rs-ord':
-    backup_user   => 'bup-wiki',
-    backup_server => 'ci-backup-rs-ord.openstack.org',
+  if $bup_user != undef {
+    include bup
+    bup::site { 'rs-ord':
+      backup_user   => $bup_user,
+      backup_server => 'ci-backup-rs-ord.openstack.org',
+    }
   }
 
   class { '::elasticsearch':