openstack
/
fuel-library
Code Issues Proposed changes

Remove deprecated parameters for nova 

Change-Id: Iff4b803076929c8253fcdd5b39c3fc440be5ed96
Closes-Bug: #1562935
This commit is contained in:
Alexey Deryugin 2016-04-18 18:38:52 +00:00
parent 29d72d0de6
commit ae2a34d1c8
4 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp
View File

@ -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,

2
deployment/puppet/openstack_tasks/manifests/roles/compute.pp
View File

@ -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,

2
tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb
View File

@ -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,

2
tests/noop/spec/hosts/roles/compute_spec.rb
View File

@ -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'],