magnum: Deprecate tempest_config_file
... because we deprecated the same parameter of the tempest class. Related-Bug: #2043210 Change-Id: I87c1db9a9d5297da4f5a716faa44f0228203893d
This commit is contained in:
parent
cc803f5b9c
commit
e82a668c40
@ -6,9 +6,6 @@
|
|||||||
#
|
#
|
||||||
# === Parameters
|
# === Parameters
|
||||||
#
|
#
|
||||||
# [*tempest_config_file*]
|
|
||||||
# Defaults to '/var/lib/tempest/etc/tempest.conf'
|
|
||||||
#
|
|
||||||
# [*provision_image*]
|
# [*provision_image*]
|
||||||
# (Optional) If ::tempest::magnum should configure the testing image
|
# (Optional) If ::tempest::magnum should configure the testing image
|
||||||
# Defaults to true
|
# Defaults to true
|
||||||
@ -71,8 +68,10 @@
|
|||||||
# (Optional) The keypair_id parameter used in Magnum tempest configuration
|
# (Optional) The keypair_id parameter used in Magnum tempest configuration
|
||||||
# Defaults to undef
|
# Defaults to undef
|
||||||
#
|
#
|
||||||
|
# [*tempest_config_file*]
|
||||||
|
# Defaults to undef
|
||||||
|
#
|
||||||
class tempest::magnum (
|
class tempest::magnum (
|
||||||
Stdlib::Absolutepath $tempest_config_file = '/var/lib/tempest/etc/tempest.conf',
|
|
||||||
Boolean $provision_image = true,
|
Boolean $provision_image = true,
|
||||||
String[1] $image_source = 'https://fedorapeople.org/groups/magnum/fedora-atomic-latest.qcow2',
|
String[1] $image_source = 'https://fedorapeople.org/groups/magnum/fedora-atomic-latest.qcow2',
|
||||||
String[1] $image_name = 'fedora-atomic-latest',
|
String[1] $image_name = 'fedora-atomic-latest',
|
||||||
@ -89,14 +88,20 @@ class tempest::magnum (
|
|||||||
Boolean $manage_tests_packages = true,
|
Boolean $manage_tests_packages = true,
|
||||||
# DEPRECATED PARAMETERS
|
# DEPRECATED PARAMETERS
|
||||||
$keypair_id = undef,
|
$keypair_id = undef,
|
||||||
|
$tempest_config_file = undef,
|
||||||
) {
|
) {
|
||||||
include tempest::params
|
include tempest::params
|
||||||
|
include tempest
|
||||||
|
|
||||||
if $keypair_id != undef {
|
if $keypair_id != undef {
|
||||||
warning("The keypair_id parameter is deprecated and has no effect. \
|
warning("The keypair_id parameter is deprecated and has no effect. \
|
||||||
Use the keypair_name parameter.")
|
Use the keypair_name parameter.")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if $tempest_config_file != undef {
|
||||||
|
warning('The tempest_config_file parameter has been deprecated and has no effect')
|
||||||
|
}
|
||||||
|
|
||||||
if $provision_image {
|
if $provision_image {
|
||||||
$image_properties = { 'os_distro' => $image_os_distro }
|
$image_properties = { 'os_distro' => $image_os_distro }
|
||||||
glance_image { $image_name:
|
glance_image { $image_name:
|
||||||
@ -138,7 +143,7 @@ Use the keypair_name parameter.")
|
|||||||
}
|
}
|
||||||
|
|
||||||
Tempest_config {
|
Tempest_config {
|
||||||
path => $tempest_config_file,
|
path => $::tempest::tempest_conf,
|
||||||
}
|
}
|
||||||
|
|
||||||
tempest_config {
|
tempest_config {
|
||||||
|
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
- |
|
||||||
|
The ``tempest::magnum::tempest_config_file`` parameter is deprecated and
|
||||||
|
has no effect now.
|
@ -1,6 +1,14 @@
|
|||||||
require 'spec_helper'
|
require 'spec_helper'
|
||||||
|
|
||||||
describe 'tempest::magnum' do
|
describe 'tempest::magnum' do
|
||||||
|
let :pre_condition do
|
||||||
|
"
|
||||||
|
class { 'tempest':
|
||||||
|
configure_networks => false,
|
||||||
|
configure_images => false
|
||||||
|
}"
|
||||||
|
end
|
||||||
|
|
||||||
let :params do
|
let :params do
|
||||||
{ :nic_id => 'b2e6021a-4956-4a1f-8329-790b9add05a9', }
|
{ :nic_id => 'b2e6021a-4956-4a1f-8329-790b9add05a9', }
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user