From 40fc367771ee810bc6f4f34e969520bae350a8e2 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Wed, 31 Jul 2013 19:13:14 +0000
Subject: [PATCH] Add a mirror33 slave node definition.

This will eventually run a job to feed any Python 3.3 specific
dependencies into the pypi mirror.

Change-Id: Idcfca576ee3b531bad54be5d53e0219f8719c25c
---
 manifests/site.pp                             |  8 ++++++
 .../manifests/mirror33_slave.pp               | 27 +++++++++++++++++++
 .../manifests/mirror_slave.pp                 |  2 ++
 3 files changed, 37 insertions(+)
 create mode 100644 modules/openstack_project/manifests/mirror33_slave.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index e19bcb75a6..000c249933 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -386,6 +386,14 @@ node 'mirror27.slave.openstack.org' {
   }
 }
 
+node 'mirror33.slave.openstack.org' {
+  include openstack_project
+  class { 'openstack_project::mirror33_slave':
+    jenkins_ssh_public_key  => $openstack_project::jenkins_ssh_key,
+    jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents')
+  }
+}
+
 node 'devstack-launch.slave.openstack.org' {
   include openstack_project
   class { 'openstack_project::devstack_launch_slave':
diff --git a/modules/openstack_project/manifests/mirror33_slave.pp b/modules/openstack_project/manifests/mirror33_slave.pp
new file mode 100644
index 0000000000..073d083775
--- /dev/null
+++ b/modules/openstack_project/manifests/mirror33_slave.pp
@@ -0,0 +1,27 @@
+# Copyright 2013  OpenStack Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# Install a python33 mirror building slave.
+
+class openstack_project::mirror33_slave (
+  $jenkins_ssh_public_key,
+  $jenkins_ssh_private_key,
+) {
+
+  class { 'openstack_project::mirror_slave':
+    jenkins_ssh_public_key  => $jenkins_ssh_public_key,
+    jenkins_ssh_private_key => $jenkins_ssh_private_key,
+    python3                 => true,
+  }
+}
diff --git a/modules/openstack_project/manifests/mirror_slave.pp b/modules/openstack_project/manifests/mirror_slave.pp
index 980f45a9de..192c14a379 100644
--- a/modules/openstack_project/manifests/mirror_slave.pp
+++ b/modules/openstack_project/manifests/mirror_slave.pp
@@ -17,10 +17,12 @@
 class openstack_project::mirror_slave (
   $jenkins_ssh_public_key,
   $jenkins_ssh_private_key,
+  $python3=false,
 ) {
 
   class { 'openstack_project::slave':
     ssh_key => $jenkins_ssh_public_key,
+    python3 => $python3,
   }
 
   include jeepyb