diff --git a/deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp b/deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp index d30c8d5996..bd3ba16d63 100644 --- a/deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp +++ b/deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp @@ -174,7 +174,6 @@ class openstack_tasks::openstack_controller::openstack_controller { $amqp_hosts = hiera('amqp_hosts','') $amqp_user = $rabbit_hash['user'] $amqp_password = $rabbit_hash['password'] - $verbose = pick($openstack_controller_hash['verbose'], true) $debug = pick($openstack_controller_hash['debug'], hiera('debug', true)) $fping_path = $::osfamily ? { @@ -195,7 +194,6 @@ class openstack_tasks::openstack_controller::openstack_controller { rabbit_password => $amqp_password, image_service => 'nova.image.glance.GlanceImageService', glance_api_servers => $glance_api_servers, - verbose => $verbose, debug => $debug, log_facility => $syslog_log_facility_nova, use_syslog => $use_syslog, diff --git a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp index 245904ad39..9f9f627ff0 100644 --- a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp +++ b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp @@ -31,7 +31,6 @@ class openstack_tasks::roles::compute { $sahara_hash = hiera_hash('sahara', {}) $murano_hash = hiera_hash('murano', {}) $mp_hash = hiera('mp') - $verbose = pick($compute_hash['verbose'], true) $debug = pick($compute_hash['debug'], hiera('debug', true)) $storage_hash = hiera_hash('storage', {}) $nova_hash = hiera_hash('nova', {}) @@ -284,7 +283,6 @@ class openstack_tasks::roles::compute { rabbit_userid => pick($rabbit_hash['user'], 'nova'), rabbit_password => $rabbit_hash['password'], glance_api_servers => $glance_api_servers, - verbose => $verbose, debug => $debug, use_syslog => $use_syslog, use_stderr => $use_stderr, diff --git a/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb b/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb index 3ada4da072..5e4c90434f 100644 --- a/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb +++ b/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb @@ -105,7 +105,6 @@ describe manifest do let(:rabbit_hash) { Noop.hiera_hash 'rabbit', {} } let(:rabbit_hosts) { Noop.puppet_function 'split', amqp_hosts, ',' } let(:openstack_controller_hash) { Noop.hiera_hash 'openstack_controller', {} } - let(:verbose) { Noop.puppet_function 'pick', openstack_controller_hash['verbose'], true } let(:debug) do global_debug = Noop.hiera 'debug', true Noop.puppet_function 'pick', openstack_controller_hash['debug'], global_debug @@ -208,7 +207,6 @@ describe manifest do :rabbit_password => rabbit_hash['password'], :image_service => 'nova.image.glance.GlanceImageService', :glance_api_servers => glance_api_servers, - :verbose => verbose, :debug => debug, :log_facility => syslog_log_facility_nova, :use_syslog => use_syslog, diff --git a/tests/noop/spec/hosts/roles/compute_spec.rb b/tests/noop/spec/hosts/roles/compute_spec.rb index e93865be7a..4159a19a1f 100644 --- a/tests/noop/spec/hosts/roles/compute_spec.rb +++ b/tests/noop/spec/hosts/roles/compute_spec.rb @@ -79,7 +79,6 @@ describe manifest do let(:nova_service_down_time) { Noop.hiera 'nova_service_down_time', '180' } - let(:verbose) { Noop.puppet_function 'pick', compute_hash['verbose'], 'true' } let(:global_debug) { Noop.hiera 'debug', 'true' } let(:debug) { Noop.puppet_function 'pick', compute_hash['debug'], global_debug } let(:config_drive_format) { Noop.puppet_function 'pick', compute_hash['config_drive_format'], 'vfat' } @@ -475,7 +474,6 @@ describe manifest do it 'configures with the default params' do should contain_class('nova').with( - 'verbose' => verbose, 'debug' => debug, 'log_facility' => log_facility, 'state_path' => nova_hash['state_path'],