diff --git a/lib/puppet/provider/openstack/credentials.rb b/lib/puppet/provider/openstack/credentials.rb index 0dec7878..95a1a49f 100644 --- a/lib/puppet/provider/openstack/credentials.rb +++ b/lib/puppet/provider/openstack/credentials.rb @@ -6,7 +6,8 @@ class Puppet::Provider::Openstack::Credentials KEYS = [ :auth_url, :password, :project_name, :username, :token, :url, - :identity_api_version + :identity_api_version, + :region_name ] KEYS.each { |var| attr_accessor var } diff --git a/releasenotes/notes/support_region_name_in_providers-cde6d75f0ddbec28.yaml b/releasenotes/notes/support_region_name_in_providers-cde6d75f0ddbec28.yaml new file mode 100644 index 00000000..7370d3b1 --- /dev/null +++ b/releasenotes/notes/support_region_name_in_providers-cde6d75f0ddbec28.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - Add support for multiple regions in base provider code used by other puppet + modules. diff --git a/spec/unit/provider/openstack/credentials_spec.rb b/spec/unit/provider/openstack/credentials_spec.rb index aa81ec29..2a484a23 100644 --- a/spec/unit/provider/openstack/credentials_spec.rb +++ b/spec/unit/provider/openstack/credentials_spec.rb @@ -114,6 +114,7 @@ describe Puppet::Provider::Openstack::Credentials do creds.token = 'token' creds.url = 'url' creds.identity_api_version = 'identity_api_version' + creds.region_name = 'Region1' expect(creds.to_env).to eq({ 'OS_USERNAME' => 'username', 'OS_PASSWORD' => 'password', @@ -121,7 +122,8 @@ describe Puppet::Provider::Openstack::Credentials do 'OS_AUTH_URL' => 'auth_url', 'OS_TOKEN' => 'token', 'OS_URL' => 'url', - 'OS_IDENTITY_API_VERSION' => 'identity_api_version' + 'OS_IDENTITY_API_VERSION' => 'identity_api_version', + 'OS_REGION_NAME' => 'Region1', }) end end