opendev
/
system-config
Code Issues Proposed changes

Remove empty single_use_slave class 

Our current version of project-config no longer needs to use this class
to build nodepool nodes. Third party CI systems will have to update to
the latest version of project-config to prevent his change from breaking
them.

Change-Id: I14a45e700b33cfcaebb7f6242ad00a010935e36c
Depends-On: Ib241ea976ca0a3d661599f36e3f5a2d4eb023c08
Depends-On: Ib1c2f6085f9e8b40e6a78cfb898738b0950bc339
This commit is contained in:
Colleen Murphy 2017-04-29 19:57:21 +02:00
parent 0fe57bd954
commit 7eab62a4ad
3 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/source/nodepool.rst
View File

@ -15,7 +15,6 @@ At a Glance
* nodepool.openstack.org
:Puppet:
* https://git.openstack.org/cgit/openstack-infra/puppet-openstackci/tree/manifests/nodepool.pp
* :file:`modules/openstack_project/manifests/single_use_slave.pp`
:Configuration:
* :config:`nodepool/nodepool.yaml`
* :config:`nodepool/scripts/`

16
manifests/site.pp
View File

@ -1419,22 +1419,6 @@ node 'openstackid-dev.openstack.org' {
}
}
# Node-OS: centos7
# Node-OS: fedora24
# Node-OS: fedora25
# Node-OS: jessie
# Node-OS: trusty
# Node-OS: xenial
# This is not meant to be an actual node that connects to the master.
# This is a dummy node definition to trigger a test of the code path used by
# nodepool's prepare_node scripts in the apply tests
# NOTE(pabelanger): These are the current settings we use for devstack-* nodes.
node 'single-use-slave-devstack' {
class { 'openstack_project::single_use_slave':
sudo => true,
}
}
# Node-OS: trusty
# Used for testing all-in-one deployments
node 'single-node-ci.test.only' {

15
modules/openstack_project/manifests/single_use_slave.pp
View File

@ -1,15 +0,0 @@
# == Class: openstack_project::single_use_slave
#
# This class configures single use Jenkins slaves with a few
# toggleable options. Most importantly sudo rights for the Jenkins
# user are by default off but can be enabled.
class openstack_project::single_use_slave (
$certname = $::fqdn,
$install_resolv_conf = true,
$sudo = false,
# TODO(pabelanger): To be removed in a future patch.
$ssh_key = $openstack_project::jenkins_ssh_key,
$jenkins_gitfullname = 'OpenStack Jenkins',
$jenkins_gitemail = 'jenkins@openstack.org',
) inherits openstack_project {
}