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
This commit is contained in:
David Shrewsbury 2017-07-19 11:18:38 -04:00
parent f8b6cb2990
commit 26ad94ec52
3 changed files with 6 additions and 0 deletions

View File

@ -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) {

View File

@ -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':

View File

@ -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':