Remove deprecated nova::placement::os_interface
... because the parameter was deprecated in Stein[1], and has been
deprecated for 3 cycles.
[1] b1181f6242
Change-Id: I097db4dc137b2baf6c6acb684820fa42528c5df5
This commit is contained in:
parent
4dd1b7beaa
commit
b4d9555e1d
|
@ -48,13 +48,6 @@
|
||||||
# and not the Identity service API IP and port.
|
# and not the Identity service API IP and port.
|
||||||
# Defaults to 'http://127.0.0.1:5000/v3'
|
# Defaults to 'http://127.0.0.1:5000/v3'
|
||||||
#
|
#
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
#
|
|
||||||
# [*os_interface*]
|
|
||||||
# (optional) interface name used for getting the keystone endpoint for
|
|
||||||
# the placement API.
|
|
||||||
# Defaults to undef
|
|
||||||
|
|
||||||
class nova::placement(
|
class nova::placement(
|
||||||
$password = false,
|
$password = false,
|
||||||
$auth_type = 'password',
|
$auth_type = 'password',
|
||||||
|
@ -65,17 +58,10 @@ class nova::placement(
|
||||||
$project_name = 'services',
|
$project_name = 'services',
|
||||||
$user_domain_name = 'Default',
|
$user_domain_name = 'Default',
|
||||||
$username = 'placement',
|
$username = 'placement',
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
$os_interface = undef,
|
|
||||||
) inherits nova::params {
|
) inherits nova::params {
|
||||||
|
|
||||||
include nova::deps
|
include nova::deps
|
||||||
|
|
||||||
if $os_interface {
|
|
||||||
warning('nova::placement::os_interface is deprecated for removal, please use valid_interfaces instead.')
|
|
||||||
}
|
|
||||||
$valid_interfaces_real = pick($os_interface, $valid_interfaces)
|
|
||||||
|
|
||||||
nova_config {
|
nova_config {
|
||||||
'placement/auth_type': value => $auth_type;
|
'placement/auth_type': value => $auth_type;
|
||||||
'placement/auth_url': value => $auth_url;
|
'placement/auth_url': value => $auth_url;
|
||||||
|
@ -85,7 +71,7 @@ class nova::placement(
|
||||||
'placement/user_domain_name': value => $user_domain_name;
|
'placement/user_domain_name': value => $user_domain_name;
|
||||||
'placement/username': value => $username;
|
'placement/username': value => $username;
|
||||||
'placement/region_name': value => $region_name;
|
'placement/region_name': value => $region_name;
|
||||||
'placement/valid_interfaces': value => $valid_interfaces_real;
|
'placement/valid_interfaces': value => $valid_interfaces;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The ``nova::placement::os_interface`` parameter has been removed.
|
Loading…
Reference in New Issue