remove ec2 related options
previously deprecated config option '''ec2_listen_port''' '''ec2_workers''' '''keystone_ec2_url''' to be removed, as they were never used in code. Change-Id: I7a4d5251e8cff6b72f14c645f44a46fb9c44623d
This commit is contained in:
parent
b8a6667bbb
commit
fd1b58e28d
@ -207,18 +207,6 @@
|
||||
#
|
||||
# DEPRECATED
|
||||
#
|
||||
# [*keystone_ec2_url*]
|
||||
# (optional) DEPRECATED. The keystone url where nova should send requests for ec2tokens
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*ec2_listen_port*]
|
||||
# (optional) DEPRECATED. The port on which the EC2 API will listen.
|
||||
# Defaults to port undef
|
||||
#
|
||||
# [*ec2_workers*]
|
||||
# (optional) DEPRECATED. Number of workers for EC2 service
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*conductor_workers*]
|
||||
# (optional) DEPRECATED. Use workers parameter of nova::conductor
|
||||
# Class instead.
|
||||
@ -269,9 +257,6 @@ class nova::api(
|
||||
$allow_resize_to_same_host = false,
|
||||
# DEPRECATED PARAMETER
|
||||
$conductor_workers = undef,
|
||||
$ec2_listen_port = undef,
|
||||
$ec2_workers = undef,
|
||||
$keystone_ec2_url = undef,
|
||||
) inherits nova::params {
|
||||
|
||||
include ::nova::deps
|
||||
@ -284,10 +269,6 @@ class nova::api(
|
||||
Class['cinder::client'] ~> Nova::Generic_service['api']
|
||||
}
|
||||
|
||||
if $ec2_listen_port or $ec2_workers or $keystone_ec2_url {
|
||||
warning('ec2_listen_port, ec2_workers and keystone_ec2_url are deprecated and have no effect. Deploy openstack/ec2-api instead.')
|
||||
}
|
||||
|
||||
if $conductor_workers {
|
||||
warning('The conductor_workers parameter is deprecated and has no effect. Use workers parameter of nova::conductor class instead.')
|
||||
}
|
||||
|
@ -0,0 +1,8 @@
|
||||
---
|
||||
deprecations:
|
||||
- remove ec2 related options
|
||||
previously deprecated config option
|
||||
''ec2_listen_port''
|
||||
''ec2_workers''
|
||||
''keystone_ec2_url''
|
||||
to be removed, as they were never used in code.
|
Loading…
Reference in New Issue
Block a user