diff --git a/manifests/server/placement.pp b/manifests/server/placement.pp index a85251c2a..657b09d68 100644 --- a/manifests/server/placement.pp +++ b/manifests/server/placement.pp @@ -42,7 +42,7 @@ # # [*username*] # (optional) Username when talking to placement. -# Defaults to 'nova' +# Defaults to 'placement' # # [*auth_url*] # (optional) Keystone auth URL. @@ -67,7 +67,7 @@ class neutron::server::placement ( $project_name = 'services', $system_scope = $::os_service_default, $user_domain_name = 'Default', - $username = 'nova', + $username = 'placement', $auth_url = 'http://127.0.0.1:5000', $region_name = $::os_service_default, $endpoint_type = $::os_service_default, @@ -75,11 +75,6 @@ class neutron::server::placement ( include neutron::deps - # TODO(tobias-urdin): Update default value to placement in next release. - if $username == 'nova' { - warning('The default value of username will change to placement in the next release') - } - if is_service_default($system_scope) { $project_name_real = $project_name $project_domain_name_real = $project_domain_name diff --git a/releasenotes/notes/placement-user-beabb88e260508e6.yaml b/releasenotes/notes/placement-user-beabb88e260508e6.yaml new file mode 100644 index 000000000..5e916091a --- /dev/null +++ b/releasenotes/notes/placement-user-beabb88e260508e6.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Defaut value of the ``neutron::server::placement::username`` has been + changed from ``nova`` to ``placement``. diff --git a/spec/classes/neutron_server_placement_spec.rb b/spec/classes/neutron_server_placement_spec.rb index a7a72a70b..e3f26dd20 100644 --- a/spec/classes/neutron_server_placement_spec.rb +++ b/spec/classes/neutron_server_placement_spec.rb @@ -29,7 +29,7 @@ describe 'neutron::server::placement' do should contain_neutron_config('placement/project_name').with_value('services') should contain_neutron_config('placement/system_scope').with_value('') should contain_neutron_config('placement/user_domain_name').with_value('Default') - should contain_neutron_config('placement/username').with_value('nova') + should contain_neutron_config('placement/username').with_value('placement') should contain_neutron_config('placement/password').with_value('secrete').with_secret( true ) should contain_neutron_config('placement/auth_url').with_value('http://127.0.0.1:5000') should contain_neutron_config('placement/region_name').with_value('')