openstack
/
puppet-openstack-integration
Code Issues Proposed changes

Switch to www_authenticate_uri for ec2api 

puppet-ec2api switched to www_authenticate_uri in
[1], update puppet-openstack-integration for the same.

[1] https://review.openstack.org/#/c/558441/

Change-Id: I02f4bf8328bd40a00a1901beb9c55d647cf13543
This commit is contained in:
zhubingbing 2018-04-24 20:23:40 +08:00
parent 59dbd7ad7a
commit b8719a10a6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/ec2api.pp
View File

@ -25,9 +25,9 @@ class openstack_integration::ec2api {
}
class { '::ec2api': }
class { '::ec2api::keystone::authtoken':
password => 'a_big_secret',
auth_url => $::openstack_integration::config::keystone_admin_uri,
auth_uri => $::openstack_integration::config::keystone_auth_uri,
password => 'a_big_secret',
auth_url => $::openstack_integration::config::keystone_admin_uri,
www_authenticate_uri => $::openstack_integration::config::keystone_auth_uri,
}
class { '::ec2api::api':
keystone_ec2_tokens_url => "${::openstack_integration::config::keystone_auth_uri}/v3/ec2tokens",