From dca0587ce9f75e9c276f875d8806de8099dce8de Mon Sep 17 00:00:00 2001 From: Roger Luethi Date: Thu, 27 Sep 2018 14:45:53 +0200 Subject: [PATCH] placement: os_region_name -> region_name Source: * openstack/nova git repo: Update the deprecate os_region_name option Change-Id: Id44d456bb1bdb0c5564ad4f5d9cdee2f41226052 commit d163fb6d697d74ea93ffc394187871a3a8c4ccd8 backport: queens Change-Id: I47f8451b830892ff0b2d85a553cfe31b8deec1b0 --- attributes/nova_conf.rb | 2 +- spec/nova-common_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/attributes/nova_conf.rb b/attributes/nova_conf.rb index 82d7a73d..db02aac0 100644 --- a/attributes/nova_conf.rb +++ b/attributes/nova_conf.rb @@ -49,7 +49,7 @@ default['openstack']['compute']['conf'].tap do |conf| # [placement] section conf['placement']['auth_type'] = 'password' - conf['placement']['os_region_name'] = node['openstack']['region'] + conf['placement']['region_name'] = node['openstack']['region'] conf['placement']['username'] = 'placement' conf['placement']['user_domain_name'] = 'Default' conf['placement']['project_domain_name'] = 'Default' diff --git a/spec/nova-common_spec.rb b/spec/nova-common_spec.rb index 90200ed7..ef8284e7 100644 --- a/spec/nova-common_spec.rb +++ b/spec/nova-common_spec.rb @@ -134,7 +134,7 @@ describe 'openstack-compute::nova-common' do it 'has correct authentication settings' do [ 'auth_type = password', - 'os_region_name = RegionOne', + 'region_name = RegionOne', 'password = placement-pass', 'username = placement', 'project_name = service',