diff --git a/manifests/site.pp b/manifests/site.pp index 23cd0d27bd..35f0257a03 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -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: fedora24 # Node-OS: fedora25 @@ -1439,7 +1425,6 @@ node 'single-use-slave-bare' { node 'single-use-slave-devstack' { class { 'openstack_project::single_use_slave': sudo => true, - thin => true, } } diff --git a/modules/openstack_project/manifests/single_use_slave.pp b/modules/openstack_project/manifests/single_use_slave.pp index a483738361..05ac5618da 100644 --- a/modules/openstack_project/manifests/single_use_slave.pp +++ b/modules/openstack_project/manifests/single_use_slave.pp @@ -54,9 +54,6 @@ class openstack_project::single_use_slave ( } if (! $thin) { - class { 'openstack_project::thick_slave': - all_mysql_privs => $all_mysql_privs, - } + notice("The openstack_project::single_use_slave::thin parameter has no effect.") } - }