From f2b633360315cdb7aa3d56d9e8f4b653c3b636ff Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 27 Feb 2017 09:09:48 -0800
Subject: [PATCH] Add puppetry for translate01 xenialing

This is part of the Zanata upgrade process. We will be deploying new
Zanata to translate01.openstack.org so add node def in site.pp to
support that. This keeps the old translate.o.o def too so that it is
left alone untouched.

Note that this also adds code to pass through wildlfy's install URL and
fixes the specification of the wildfly version number. I think the
version number var being wrong was not a problem for us because the
wildfly installation only runs if there is no installation dir in place.

Change-Id: I4b6ababcc34e2464cf6a824e92a1c146d553dcaf
---
 manifests/site.pp                             | 27 +++++++++++++++++++
 .../openstack_project/manifests/translate.pp  |  6 +++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index bc2e9f526b..38149d27f1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1580,6 +1580,33 @@ node 'translate.openstack.org' {
   }
 }
 
+# Node-OS: trusty
+# Node-OS: xenial
+node /^translate\d+\.openstack\.org$/ {
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [80, 443],
+    sysadmins                 => hiera('sysadmins', []),
+  }
+  class { 'openstack_project::translate':
+    admin_users                => 'aeng,camunoz,cboylan,daisyycguo,infra,jaegerandi,lyz,mordred,stevenk',
+    openid_url                 => 'https://openstackid.org',
+    listeners                  => ['ajp'],
+    from_address               => 'noreply@openstack.org',
+    mysql_host                 => "invalid.host.for.now",
+    mysql_password             => "supersecret",
+    zanata_server_user         => hiera('proposal_zanata_user'),
+    zanata_server_api_key      => hiera('proposal_zanata_api_key'),
+    zanata_wildfly_version     => '10.1.0',
+    zanata_wildfly_install_url => 'https://repo1.maven.org/maven2/org/wildfly/wildfly-dist/10.1.0.Final/wildfly-dist-10.1.0.Final.tar.gz',
+    zanata_url                 => 'https://github.com/zanata/zanata-server/releases/download/server-3.9.6/zanata-3.9.6-wildfly.zip',
+    zanata_checksum            => 'cb7a477f46a118a337b59b9f4004ef7e6c77a1a8',
+    project_config_repo        => 'https://git.openstack.org/openstack-infra/project-config',
+    ssl_cert_file_contents     => hiera('translate_ssl_cert_file_contents'),
+    ssl_key_file_contents      => hiera('translate_ssl_key_file_contents'),
+    ssl_chain_file_contents    => hiera('translate_ssl_chain_file_contents'),
+  }
+}
+
 # Node-OS: trusty
 # Node-OS: xenial
 node /^translate-dev\d*\.openstack\.org$/ {
diff --git a/modules/openstack_project/manifests/translate.pp b/modules/openstack_project/manifests/translate.pp
index ad0b139445..a03a68add9 100644
--- a/modules/openstack_project/manifests/translate.pp
+++ b/modules/openstack_project/manifests/translate.pp
@@ -22,7 +22,8 @@ class openstack_project::translate(
   $admin_users = '',
   $zanata_server_user = '',
   $zanata_server_api_key = '',
-  $zanata_wildfly_version = '',
+  $zanata_wildfly_version = '9.0.1',
+  $zanata_wildfly_install_url = 'https://repo1.maven.org/maven2/org/wildfly/wildfly-dist/9.0.1.Final/wildfly-dist-9.0.1.Final.tar.gz',
   $zanata_url = '',
   $zanata_checksum = '',
   $project_config_repo = '',
@@ -51,7 +52,8 @@ class openstack_project::translate(
     zanata_listeners            => $listeners,
     zanata_admin_users          => $admin_users,
     zanata_default_from_address => $from_address,
-    zanata_wildfly_version      => $wildfly_version,
+    zanata_wildfly_version      => $zanata_wildfly_version,
+    zanata_wildfly_install_url  => $zanata_wildfly_install_url,
     zanata_url                  => $zanata_url,
     zanata_checksum             => $zanata_checksum,
   }