From 54ae2200e1782b21e7a39c5b65a556faa3e23c91 Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Sat, 25 Mar 2017 15:05:39 +0100 Subject: [PATCH] Remove thick_slave from single_use_slave There is nothing in system-config or the zuul worker builders that set thin to false, so let's just clean this up so we can see more easily what this class does. Change-Id: Ia71cfe61850bdc89f323a2774231b4e2c709ac17 --- manifests/site.pp | 15 --------------- .../manifests/single_use_slave.pp | 5 +---- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 8165f4e9e6..b576e5d0ce 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1413,20 +1413,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 @@ -1440,7 +1426,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.") } - }