From 3c42a853d60250f4a83017f42ecd4ac0ef925026 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Wed, 12 Apr 2017 20:08:32 +0200
Subject: [PATCH] Remove unused params in puppet builds

We always want zuul workers to be thin, it doesn't need to be
configurable. We made these parameters nonfunctional in the
single_use_slave class[1] so we can stop using them here.

[1] https://review.openstack.org/#/c/449958/

Change-Id: I78cf0f86cc162439303c85b3c6cc5fb8d0fd0493
---
 nodepool/elements/prepare-node/install.d/20-prepare-node | 1 -
 nodepool/elements/puppet/bin/prepare-node                | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/nodepool/elements/prepare-node/install.d/20-prepare-node b/nodepool/elements/prepare-node/install.d/20-prepare-node
index e89803cfdf..d1917cd9f1 100755
--- a/nodepool/elements/prepare-node/install.d/20-prepare-node
+++ b/nodepool/elements/prepare-node/install.d/20-prepare-node
@@ -22,7 +22,6 @@ fi
 set -e
 
 export SUDO='true'
-export THIN='true'
 
 prepare-node
 
diff --git a/nodepool/elements/puppet/bin/prepare-node b/nodepool/elements/puppet/bin/prepare-node
index c42ca257ed..26a770cae2 100755
--- a/nodepool/elements/puppet/bin/prepare-node
+++ b/nodepool/elements/puppet/bin/prepare-node
@@ -19,8 +19,6 @@
 set -e
 
 SUDO=${SUDO:-true}
-THIN=${THIN:-true}
-ALL_MYSQL_PRIVS=${ALL_MYSQL_PRIVS:-false}
 
 if [ -n "$NODEPOOL_SSH_KEY" ] ; then
     puppet_install_users="install_users => false,
@@ -39,8 +37,6 @@ Service {
 }
 class {'openstack_project::single_use_slave':
   sudo => $SUDO,
-  thin => $THIN,
-  all_mysql_privs => $ALL_MYSQL_PRIVS,
   install_resolv_conf => false,
   $puppet_install_users
 }