diff --git a/manifests/api.pp b/manifests/api.pp index 8a8fe7b9b..f7e74238b 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -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.') } diff --git a/releasenotes/notes/remove_deprecated_ec2_related_option-47bda9520a888853.yaml b/releasenotes/notes/remove_deprecated_ec2_related_option-47bda9520a888853.yaml new file mode 100644 index 000000000..bb70ee804 --- /dev/null +++ b/releasenotes/notes/remove_deprecated_ec2_related_option-47bda9520a888853.yaml @@ -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.