Fix duplicate parameters and drop mock
This change removes the duplicate parameters from the main ironic class. With the update to 3.8.5, this now shows up as a syntax error in the syntax jobs. We should only define these parameters once. Also mock is not used anywhere in the module, let's drop it. This patch will help to hit this bug: https://launchpad.net/bugs/1492636 Change-Id: Iaa6acafdc771118c74f85f3332f01b58d233743b Closes-Bug: #1537251 Co-Authored-By: Emilien Macchi <emilien@redhat.com>
This commit is contained in:
parent
df772a1c60
commit
4dd2bff699
1
Gemfile
1
Gemfile
@ -14,7 +14,6 @@ group :development, :test do
|
||||
gem 'puppet-lint-variable_contains_upcase', :require => 'false'
|
||||
gem 'puppet-lint-numericvariable', :require => 'false'
|
||||
gem 'json', :require => 'false'
|
||||
gem 'webmock', :require => 'false'
|
||||
gem 'puppet-openstack_spec_helper',
|
||||
:git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper',
|
||||
:require => false
|
||||
|
@ -110,12 +110,6 @@
|
||||
# Use durable queues in amqp.
|
||||
# (Optional) Defaults to false.
|
||||
#
|
||||
# [*rabbit_hosts*]
|
||||
# (optional) array of rabbitmq servers for HA.
|
||||
# A single IP address, such as a VIP, can be used for load-balancing
|
||||
# multiple RabbitMQ Brokers.
|
||||
# Defaults to false
|
||||
#
|
||||
# [*use_syslog*]
|
||||
# (optional) Use syslog for logging
|
||||
# Defaults to undef.
|
||||
@ -215,7 +209,6 @@ class ironic (
|
||||
$rabbit_virtual_host = '/',
|
||||
$rabbit_host = 'localhost',
|
||||
$rabbit_port = 5672,
|
||||
$rabbit_hosts = false,
|
||||
$rabbit_userid = 'guest',
|
||||
$rabbit_password = false,
|
||||
$rabbit_use_ssl = false,
|
||||
@ -224,8 +217,6 @@ class ironic (
|
||||
$kombu_ssl_keyfile = undef,
|
||||
$kombu_ssl_version = 'TLSv1',
|
||||
$amqp_durable_queues = false,
|
||||
$use_syslog = false,
|
||||
$log_facility = 'LOG_USER',
|
||||
$database_connection = undef,
|
||||
$database_max_retries = undef,
|
||||
$database_idle_timeout = undef,
|
||||
|
@ -124,7 +124,6 @@ class ironic::keystone::auth (
|
||||
$service_name = undef,
|
||||
$service_type = 'baremetal',
|
||||
$service_description = 'Ironic Bare Metal Provisioning Service',
|
||||
$public_protocol = 'http',
|
||||
$region = 'RegionOne',
|
||||
$public_url = 'http://127.0.0.1:6385',
|
||||
$admin_url = 'http://127.0.0.1:6385',
|
||||
|
@ -1,6 +1,5 @@
|
||||
require 'puppetlabs_spec_helper/module_spec_helper'
|
||||
require 'shared_examples'
|
||||
require 'webmock/rspec'
|
||||
|
||||
require 'puppet-openstack_spec_helper/defaults'
|
||||
require 'rspec-puppet-facts'
|
||||
|
Loading…
Reference in New Issue
Block a user