opendev/system-config
Code Issues Proposed changes

Merge "Remove thick_slave from single_use_slave"

Browse Source
This commit is contained in:
Jenkins 2017-04-10 15:22:36 +00:00 committed by Gerrit Code Review
commit 0ded9ce571
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/site.pp
View File

@ -1412,20 +1412,6 @@ node 'openstackid-dev.openstack.org' {
} }
} }
# Node-OS: trusty
# 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 settings we currently use for bare-* nodes.
# It includes thick_slave.pp.
node 'single-use-slave-bare' {
class { 'openstack_project::single_use_slave':
# Test non-default values from prepare_node_bare.sh
sudo => true,
thin => false,
}
}
# Node-OS: centos7 # Node-OS: centos7
# Node-OS: fedora24 # Node-OS: fedora24
# Node-OS: fedora25 # Node-OS: fedora25
@ -1439,7 +1425,6 @@ node 'single-use-slave-bare' {
node 'single-use-slave-devstack' { node 'single-use-slave-devstack' {
class { 'openstack_project::single_use_slave': class { 'openstack_project::single_use_slave':
sudo => true, sudo => true,
thin => true,
} }
} }

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

@ -54,9 +54,6 @@ class openstack_project::single_use_slave (
} }
if (! $thin) { if (! $thin) {
class { 'openstack_project::thick_slave': notice("The openstack_project::single_use_slave::thin parameter has no effect.")
all_mysql_privs => $all_mysql_privs,
}
} }
} }