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
This commit is contained in:
parent
c68db4e10d
commit
3c42a853d6
@ -22,7 +22,6 @@ fi
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
export SUDO='true'
|
export SUDO='true'
|
||||||
export THIN='true'
|
|
||||||
|
|
||||||
prepare-node
|
prepare-node
|
||||||
|
|
||||||
|
@ -19,8 +19,6 @@
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
SUDO=${SUDO:-true}
|
SUDO=${SUDO:-true}
|
||||||
THIN=${THIN:-true}
|
|
||||||
ALL_MYSQL_PRIVS=${ALL_MYSQL_PRIVS:-false}
|
|
||||||
|
|
||||||
if [ -n "$NODEPOOL_SSH_KEY" ] ; then
|
if [ -n "$NODEPOOL_SSH_KEY" ] ; then
|
||||||
puppet_install_users="install_users => false,
|
puppet_install_users="install_users => false,
|
||||||
@ -39,8 +37,6 @@ Service {
|
|||||||
}
|
}
|
||||||
class {'openstack_project::single_use_slave':
|
class {'openstack_project::single_use_slave':
|
||||||
sudo => $SUDO,
|
sudo => $SUDO,
|
||||||
thin => $THIN,
|
|
||||||
all_mysql_privs => $ALL_MYSQL_PRIVS,
|
|
||||||
install_resolv_conf => false,
|
install_resolv_conf => false,
|
||||||
$puppet_install_users
|
$puppet_install_users
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user