From 26ad94ec52d94160f362d4fcf6133c8f304c70a5 Mon Sep 17 00:00:00 2001
From: David Shrewsbury <shrewsbury.dave@gmail.com>
Date: Wed, 19 Jul 2017 11:18:38 -0400
Subject: [PATCH] Add support for python 3 for nodepool

Allow our nodepool installations to be installed under python 3.
Goal is to eventually remove py2 support from nodepool for zuulv3.

Change-Id: Icac77f88e411a3ac08fc54afb4e9746039f908e8
Depends-On: Ie2c223d74b32798e5f0cb0ca8b76d9fa6a4f3095
---
 manifests/nodepool.pp          | 2 ++
 manifests/nodepool_builder.pp  | 2 ++
 manifests/nodepool_launcher.pp | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/manifests/nodepool.pp b/manifests/nodepool.pp
index 11d7672..7d7d351 100644
--- a/manifests/nodepool.pp
+++ b/manifests/nodepool.pp
@@ -45,6 +45,7 @@ class openstackci::nodepool (
   $mysql_user_name = 'nodepool',
   $split_daemon = false,
   $install_nodepool_builder = true,
+  $python_version = 2,
 ) {
 
   if ! defined(Class['project_config']) {
@@ -81,6 +82,7 @@ class openstackci::nodepool (
     mysql_user_name             => $mysql_user_name,
     split_daemon                => $split_daemon,
     install_nodepool_builder    => false,
+    python_version              => $python_version,
   }
 
   if (install_nodepool_builder) {
diff --git a/manifests/nodepool_builder.pp b/manifests/nodepool_builder.pp
index 78c51cf..171a090 100644
--- a/manifests/nodepool_builder.pp
+++ b/manifests/nodepool_builder.pp
@@ -36,6 +36,7 @@ class openstackci::nodepool_builder (
   $builder_logging_conf_template = 'nodepool/nodepool-builder.logging.conf.erb',
   $build_workers = '1',
   $upload_workers = '4',
+  $python_version = 2,
 ) {
 
   if ! defined(Class['project_config']) {
@@ -65,6 +66,7 @@ class openstackci::nodepool_builder (
     require                     => $::project_config::config_dir,
     install_mysql               => false,
     install_nodepool_builder    => false,
+    python_version              => $python_version,
   }
 
   class { '::nodepool::builder':
diff --git a/manifests/nodepool_launcher.pp b/manifests/nodepool_launcher.pp
index 347ef26..267d452 100644
--- a/manifests/nodepool_launcher.pp
+++ b/manifests/nodepool_launcher.pp
@@ -27,6 +27,7 @@ class openstackci::nodepool_launcher (
   $project_config_repo = '',
   $project_config_base = undef,
   $launcher_logging_conf_template = 'nodepool/nodepool-launcher.logging.conf.erb',
+  $python_version = 2,
 ) {
 
   if ! defined(Class['project_config']) {
@@ -47,6 +48,7 @@ class openstackci::nodepool_launcher (
     require                  => $::project_config::config_dir,
     install_mysql            => false,
     install_nodepool_builder => false,
+    python_version           => $python_version,
   }
 
   class { '::nodepool::launcher':